[SCM] live-build branch, debian-next, updated. debian/3.0_a41-1-12-g3a75594

Daniel Baumann daniel at debian.org
Thu Jan 12 21:23:27 UTC 2012


The following commit has been merged in the debian-next branch:
commit 3a75594b8c2590f7512702af390af0b5ff7bb4ea
Author: Colin Watson <cjwatson at ubuntu.com>
Date:   Thu Jan 12 22:22:57 2012 +0100

    Print the current time before starting a command with the lb wrapper script (Closes: #630089).

diff --git a/scripts/build/lb b/scripts/build/lb
index 58c1d12..4bb76cb 100755
--- a/scripts/build/lb
+++ b/scripts/build/lb
@@ -44,16 +44,19 @@ case "${1}" in
 
 		if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ]
 		then
-			LB=1 exec "${LB_BASE}/scripts/build/${COMMAND}" "${@}"
+			SCRIPT="${LB_BASE}/scripts/build/${COMMAND}"
 		elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ]
 		then
-			LB=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}"
+			SCRIPT=/usr/share/live/build/scripts/build/"${COMMAND}"
 		elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
 		then
-			LB=1 exec "${COMMAND}" "${@}"
+			SCRIPT="${COMMAND}"
 		else
 			Echo_error "no such script"
 			exit 1
 		fi
+
+		Echo "[%s] %s" "$(date +'%F %T')" "${COMMAND} ${*}"
+		LB=1 exec "${SCRIPT}" "${@}"
 		;;
 esac

-- 
live-build



More information about the debian-live-changes mailing list