[Debian-live-changes] r2124 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-16 19:41:17 +0000 (Sat, 16 Jun 2007)
New Revision: 2124

Modified:
   dists/trunk/live-helper/helpers/lh_binary_live-installer
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_live-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_live-installer	2007-06-16 14:30:34 UTC (rev 2123)
+++ dists/trunk/live-helper/helpers/lh_binary_live-installer	2007-06-16 19:41:17 UTC (rev 2124)
@@ -234,25 +234,6 @@
 	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
 done
 
-# Excluding udebs
-grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs > exclude
-grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs-${LIVE_ARCHITECTURE} >> exclude
-
-for EXCLUDE in `cat exclude`
-do
-	rm -f "${EXCLUDE}"_*.udeb
-done
-
-# Moving udebs
-for UDEB in ${UDEBS}
-do
-	if [ -f "`basename ${UDEB}`" ]
-	then
-		mkdir -p `dirname ${UDEB}`
-		mv "`basename ${UDEB}`" "`dirname ${UDEB}`"
-	fi
-done
-
 # Including local udebs
 if ls ../config/binary_local-udebs/* &> /dev/null
 then
@@ -278,11 +259,33 @@
 		# Install directory
 		mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
 
-		# Move files
+		# Copy files
 		cp "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Prefere local udebs over downloaded udebs
+		rm -f "`basename ${FILE} | awk -F_ '{ print $1 }'`"_*.udeb
 	done
 fi
 
+# Excluding udebs
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs > exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs-${LIVE_ARCHITECTURE} >> exclude
+
+for EXCLUDE in `cat exclude`
+do
+	rm -f "${EXCLUDE}"_*.udeb
+done
+
+# Moving udebs
+for UDEB in ${UDEBS}
+do
+	if [ -f "`basename ${UDEB}`" ]
+	then
+		mkdir -p `dirname ${UDEB}`
+		mv "`basename ${UDEB}`" "`dirname ${UDEB}`"
+	fi
+done
+
 # Creating udeb indices
 mkdir -p dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
 apt-ftparchive packages pool/main > dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages