[SCM] live-build branch, debian-next, updated. debian/3.0_a55-1-4-gcb4996f
Daniel Baumann
daniel at debian.org
Sun Jul 29 23:15:40 UTC 2012
The following commit has been merged in the debian-next branch:
commit cb4996fda2a16cd40f6ee503099c52f317f31dc5
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jul 30 01:16:29 2012 +0200
Avoid showing message in lb config running the second time through auto on git repository based config trees.
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 325c883..7e45a21 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -864,7 +864,7 @@ Local_arguments ()
Local_arguments "${@}"
-if [ -e .git ] && [ -n "${_CONFIG}" ]
+if [ -e .git ] && [ -n "${_CONFIG}" ] && [ "${1}" != "noauto" ]
then
Echo_message "Ignoring --config ${_CONFIG}: ${PWD} is already a git repository"
_CONFIG=""
--
live-build
More information about the debian-live-changes
mailing list