[SCM] Debian Live build scripts branch, master, updated. 1.0.2-4-48-g1de9070
Daniel Baumann
daniel at debian.org
Sat Jan 31 15:34:24 UTC 2009
The following commit has been merged in the master branch:
commit 1de9070b43e88696423746e8443a796869dcdd2d
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jan 31 16:33:56 2009 +0100
Fixing infinit loop when using autoconfig for lh_config and lh_clean.
diff --git a/helpers/lh_clean b/helpers/lh_clean
index 2507424..bb3d28f 100755
--- a/helpers/lh_clean
+++ b/helpers/lh_clean
@@ -10,10 +10,13 @@
set -e
# Read meta config
-if [ "${1}" != "autoconfig" ] && [ -x scripts/clean ]
+if [ "${1}" != "noautoconfig" ] && [ -x scripts/clean ]
then
./scripts/clean ${@}
-else
+fi
+
+if [ "${1}" = "noautoconfig" ]
+then
shift
fi
@@ -51,10 +54,10 @@ for ARGUMENT in ${ARGUMENTS}
do
case "${ARGUMENT}" in
--all)
- "${0}" --chroot
- "${0}" --binary
- "${0}" --stage
- "${0}" --source
+ "${0}" noautoconfig --chroot
+ "${0}" noautoconfig --binary
+ "${0}" noautoconfig --stage
+ "${0}" noautoconfig --source
if [ -d scripts ]
then
diff --git a/helpers/lh_config b/helpers/lh_config
index ff33de9..c0cd618 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -10,10 +10,13 @@
set -e
# Read meta config
-if [ "${1}" != "autoconfig" ] && [ -x scripts/config ]
+if [ "${1}" != "noautoconfig" ] && [ -x scripts/config ]
then
./scripts/config ${@}
-else
+fi
+
+if [ "${1}" = "noautoconfig" ]
+then
shift
fi
--
Debian Live build scripts
More information about the debian-live-changes
mailing list