[SCM] live-build branch, debian-next, updated. debian/3.0_a57-1-22-gb6da4ae

Daniel Baumann daniel at debian.org
Mon Aug 27 13:16:09 UTC 2012


The following commit has been merged in the debian-next branch:
commit b6da4aec0426e111f06b2693c292cc57cc8c9e5a
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 27 15:16:09 2012 +0200

    Removing old LB= hack when wrapper was not mandatory.

diff --git a/bin/lb b/bin/lb
index 63c7498..e8cdb5c 100755
--- a/bin/lb
+++ b/bin/lb
@@ -75,6 +75,6 @@ case "${1}" in
 		fi
 
 		Echo "[%s] %s" "$(date +'%F %T')" "${COMMAND} ${@}"
-		LB=1 ${ENV} exec "${SCRIPT}" "${@}"
+		${ENV} exec "${SCRIPT}" "${@}"
 		;;
 esac
diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean
index 1313041..1045064 100755
--- a/scripts/build/lb_clean
+++ b/scripts/build/lb_clean
@@ -57,10 +57,10 @@ for ARGUMENT in ${ARGUMENTS}
 do
 	case "${ARGUMENT}" in
 		--all)
-			LB=1 "${0}" noauto --chroot
-			LB=1 "${0}" noauto --binary
-			LB=1 "${0}" noauto --stage
-			LB=1 "${0}" noauto --source
+			"${0}" noauto --chroot
+			"${0}" noauto --binary
+			"${0}" noauto --stage
+			"${0}" noauto --source
 
 			rmdir --ignore-fail-on-non-empty auto > /dev/null 2>&1 || true
 			;;
@@ -109,13 +109,13 @@ do
 			;;
 
 		--remove)
-			LB=1 "${0}" --all
+			"${0}" --all
 			rm -rf cache/packages.*
 			;;
 
 		--purge)
-			LB=1 "${0}" --all
-			LB=1 "${0}" --cache
+			"${0}" --all
+			"${0}" --cache
 
 			if [ -e auto/config ]
 			then

-- 
live-build



More information about the debian-live-changes mailing list