[SCM] live-build branch, debian-next, updated. debian/3.0_a55-1-3-gda30397

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit da30397e4b4676c231f2f40787f3dbec7de27dcb
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jul 30 00:33:33 2012 +0200

    Automatically update auto/config when using --config with extra options.

diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 23d44a9..325c883 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -884,6 +884,14 @@ then
 		Echo_message "Checking out ${_GIT_BRANCH}"
 		git checkout ${_GIT_BRANCH}
 	fi
+
+	if [ -e auto/config ]
+	then
+		_EXTRA_OPTIONS="$(echo ${@} | sed -e "s|--config ${_GIT_REPOSITORY}::${_GIT_BRANCH}||g" -e "s|--config ${_GIT_REPOSITORY}||g")"
+
+		Echo_message "The following extra options specified to lb config are going to be added to auto/config: ${_EXTRA_OPTIONS}"
+		sed -i -e "s|\"\${@}\"|${_EXTRA_OPTIONS} \"\${@}\"|" auto/config
+	fi
 fi
 
 # Read meta config

-- 
live-build