[SCM] live-build branch, debian, updated. debian/3.0_a54-1-21-g227ae76

Daniel Baumann daniel at debian.org
Sun Jul 29 00:06:33 UTC 2012


The following commit has been merged in the debian branch:
commit 28cd477e7edf84936bfe7670ff4a7c052df35b9a
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jul 28 20:37:19 2012 +0200

    Showing a message about ignoring --config when the current directory already is a git repository.

diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index b3524e5..dbc7d8a 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -870,8 +870,9 @@ Local_arguments ()
 
 Local_arguments "${@}"
 
-if [ -e .git ]
+if [ -e .git ] && [ -n "${_CONFIG}" ]
 then
+	Echo_message "Ignoring --config ${_CONFIG}: ${PWD} is already a git repository"
 	_CONFIG=""
 fi
 

-- 
live-build



More information about the debian-live-changes mailing list