[SCM] live-helper branch, debian, updated. debian/2.0_a3-1-3-g256c552

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 256c552eefc10e520df6a205075bc862cb9b8854
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Dec 14 10:54:42 2009 +0100

    Changing local packageslists behaviour for consistency reasons, now looking for .list suffix and enabling them automatically (Closes: #545403).

diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index df14a0f..65c5e65 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -47,6 +47,7 @@ lh chroot_preseed ${*}
 lh chroot_local-preseed ${*}
 lh chroot_tasks ${*}
 lh chroot_packageslists ${*}
+lh chroot_local-packageslists ${*}
 lh chroot_packages ${*}
 lh chroot_local-packages ${*}
 lh chroot_install-packages ${*}
diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_local-packageslists
similarity index 59%
copy from helpers/lh_chroot_packageslists
copy to helpers/lh_chroot_local-packageslists
index 464369d..5e51ed9 100755
--- a/helpers/lh_chroot_packageslists
+++ b/helpers/lh_chroot_local-packageslists
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# lh_chroot_packageslists(1) - queue install of packages lists into chroot
+# lh_chroot_local-packageslists(1) - queue install of local packages lists into chroot
 # Copyright (C) 2006-2009 Daniel Baumann <daniel at debian.org>
 #
 # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -13,7 +13,7 @@ set -e
 . "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Setting static variables
-DESCRIPTION="$(Echo 'queue install of packages lists into chroot')"
+DESCRIPTION="$(Echo 'queue install of local packages lists into chroot')"
 HELP=""
 USAGE="${PROGRAM} [--force]"
 
@@ -23,13 +23,13 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-Echo_message "Begin queueing installation of packages lists..."
+Echo_message "Begin queueing installation of local packages lists..."
 
 # Requiring stage file
 Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
-Check_stagefile .stage/chroot_packageslists
+Check_stagefile .stage/chroot_local-packageslists
 
 # Checking lock file
 Check_lockfile .lock
@@ -37,16 +37,15 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ -n "${LH_PACKAGES_LISTS}" ] && [ "${LH_PACKAGES_LISTS}" != "none" ]
+if ls config/chroot_local-packageslists/*.list > /dev/null 2>&1
 then
-
-	for LIST in ${LH_PACKAGES_LISTS}
+	for LIST in config/chroot_local-packageslists/*.list
 	do
-		# Generating package list
-		Expand_packagelist "${LIST}" "config/chroot_local-packageslists" \
+		# Generating local package list
+		Expand_packagelist "$(basename ${LIST})" "config/chroot_local-packageslists" \
 			>> chroot/root/chroot_packages
 	done
 
 	# Creating stage file
-	Create_stagefile .stage/chroot_packageslists
+	Create_stagefile .stage/chroot_local-packageslists
 fi
diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists
index 464369d..3ec26fb 100755
--- a/helpers/lh_chroot_packageslists
+++ b/helpers/lh_chroot_packageslists
@@ -43,8 +43,7 @@ then
 	for LIST in ${LH_PACKAGES_LISTS}
 	do
 		# Generating package list
-		Expand_packagelist "${LIST}" "config/chroot_local-packageslists" \
-			>> chroot/root/chroot_packages
+		Expand_packagelist "${LIST}" >> chroot/root/chroot_packages
 	done
 
 	# Creating stage file

-- 
live-helper