[SCM] live-helper branch, debian-next, updated. debian/2.0_a10-1-10-g727165a
Daniel Baumann
daniel at debian.org
Sun Apr 18 12:43:33 UTC 2010
The following commit has been merged in the debian-next branch:
commit 727165a5e8c200cfb12e326fa1aa373812809cb8
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Apr 18 14:38:14 2010 +0200
Replacing 'noautoconfig' string in auto/ scripts with 'noauto'.
diff --git a/helpers/build b/helpers/build
index 9f619b1..c762b43 100755
--- a/helpers/build
+++ b/helpers/build
@@ -20,12 +20,12 @@ then
fi
# Read meta config
-if [ "${1}" != "noautoconfig" ] && [ -x auto/build ]
+if [ "${1}" != "noauto" ] && [ -x auto/build ]
then
./auto/build ${@}
fi
-if [ "${1}" = "noautoconfig" ]
+if [ "${1}" = "noauto" ]
then
shift
fi
diff --git a/helpers/clean b/helpers/clean
index 2348b0f..2b5dac6 100755
--- a/helpers/clean
+++ b/helpers/clean
@@ -10,12 +10,12 @@
set -e
# Read meta config
-if [ "${1}" != "noautoconfig" ] && [ -x auto/clean ]
+if [ "${1}" != "noauto" ] && [ -x auto/clean ]
then
./auto/clean ${@}
fi
-if [ "${1}" = "noautoconfig" ]
+if [ "${1}" = "noauto" ]
then
shift
fi
@@ -54,10 +54,10 @@ for ARGUMENT in ${ARGUMENTS}
do
case "${ARGUMENT}" in
--all)
- LH=1 "${0}" noautoconfig --chroot
- LH=1 "${0}" noautoconfig --binary
- LH=1 "${0}" noautoconfig --stage
- LH=1 "${0}" noautoconfig --source
+ LH=1 "${0}" noauto --chroot
+ LH=1 "${0}" noauto --binary
+ LH=1 "${0}" noauto --stage
+ LH=1 "${0}" noauto --source
if [ -d auto ]
then
diff --git a/helpers/config b/helpers/config
index bab31b5..2a37dbe 100755
--- a/helpers/config
+++ b/helpers/config
@@ -10,12 +10,12 @@
set -e
# Read meta config
-if [ "${1}" != "noautoconfig" ] && [ -x auto/config ]
+if [ "${1}" != "noauto" ] && [ -x auto/config ]
then
./auto/config ${@}
fi
-if [ "${1}" = "noautoconfig" ]
+if [ "${1}" = "noauto" ]
then
shift
fi
--
live-helper
More information about the debian-live-changes
mailing list