[SCM] live-build branch, debian-next, updated. debian/3.0_a26-1-2-g8a0da57

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 8a0da5726657de9024197bdb4c17f35423199a0a
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Aug 5 08:40:03 2011 +0200

    Reverse keywords in suffix of the package list files for consistency.
    
    Previously, config/package-lists/foo.{binary,chroot}.list was used,
    now we use config/package-lists/foo.list.{binary,chroot}.
    
    That way, we're using the same single suffix for all files to make
    them specific for either binary and chroot, rather than having
    an exception to the rule for package list files.

diff --git a/scripts/build/lb_binary_local-packagelists b/scripts/build/lb_binary_local-packagelists
index b0d28ab..cef6065 100755
--- a/scripts/build/lb_binary_local-packagelists
+++ b/scripts/build/lb_binary_local-packagelists
@@ -38,7 +38,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if Find_files config/package-lists/*.binary.list
+if Find_files config/package-lists/*.list.binary
 then
 	# Restoring cache
 	Restore_cache cache/packages_chroot
@@ -53,7 +53,7 @@ then
 	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
 	touch chroot/var/lib/dpkg/status
 
-	for PACKAGELIST in config/package-lists/*.binary.list
+	for PACKAGELIST in config/package-lists/*.list.binary
 	do
 		# Generate package list
 		Expand_packagelist "${PACKAGELIST}" "config/package-lists" > chroot/root/"$(basename ${PACKAGELIST})"
diff --git a/scripts/build/lb_chroot_local-packagelists b/scripts/build/lb_chroot_local-packagelists
index a2160be..eb93af9 100755
--- a/scripts/build/lb_chroot_local-packagelists
+++ b/scripts/build/lb_chroot_local-packagelists
@@ -41,10 +41,10 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if ls config/package-lists/*.chroot.list > /dev/null 2>&1 || \
-   ls config/package-lists/*.chroot_${_PASS}.list > /dev/null 2>&1
+if ls config/package-lists/*.list.chroot > /dev/null 2>&1 || \
+   ls config/package-lists/*.list.chroot_${_PASS} > /dev/null 2>&1
 then
-	for LIST in config/package-lists/*.chroot.list config/package-lists/*.chroot_${_PASS}.list
+	for LIST in config/package-lists/*.list.chroot config/package-lists/*.list.chroot_${_PASS}
 	do
 		if [ -e "${LIST}" ]
 		then
diff --git a/scripts/build/lb_chroot_task-lists b/scripts/build/lb_chroot_task-lists
index 2bdffd8..57f5518 100755
--- a/scripts/build/lb_chroot_task-lists
+++ b/scripts/build/lb_chroot_task-lists
@@ -41,10 +41,10 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if ls config/task-lists/*.chroot.list > /dev/null 2>&1 || \
-   ls config/task-lists/*.chroot_${_PASS}.list > /dev/null 2>&1
+if ls config/task-lists/*.list.chroot > /dev/null 2>&1 || \
+   ls config/task-lists/*.list.chroot_${_PASS} > /dev/null 2>&1
 then
-	for LIST in config/task-lists/*.chroot.list config/task-lists/*.chroot_${_PASS}.list
+	for LIST in config/task-lists/*.list.chroot config/task-lists/*.list.chroot_${_PASS}
 	do
 		if [ -e "${LIST}" ]
 		then
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 597cfcf..a3051b5 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1393,7 +1393,7 @@ mkdir -p auto/scripts
 if [ "${CONFIG}" = "clone" ] # FIXME
 then
 	# Read package selection
-	echo $(dpkg --get-selections | awk '{ print $1 }') > config/package-lists/local-system.chroot.list
+	echo $(dpkg --get-selections | awk '{ print $1 }') > config/package-lists/local.list.chroot
 	LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS} local-system"
 
 	# Read debconf questions

-- 
live-build