summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-07-30 01:16:29 +0200
committerDaniel Baumann <daniel@debian.org>2012-07-30 01:19:05 +0200
commita48c974c9ca35c0ded39df3ab6ac91c415d08f13 (patch)
treec4b3fa8e3ba55bfeb55b6af02f47793bacfb16b5
parentda30397e4b4676c231f2f40787f3dbec7de27dcb (diff)
downloadvyos-live-build-a48c974c9ca35c0ded39df3ab6ac91c415d08f13.tar.gz
vyos-live-build-a48c974c9ca35c0ded39df3ab6ac91c415d08f13.zip
Avoid showing message in lb config running the second time through auto on git repository based config trees.
-rwxr-xr-xscripts/build/lb_config6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 325c8836b..91ec2f158 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -866,7 +866,11 @@ Local_arguments "${@}"
if [ -e .git ] && [ -n "${_CONFIG}" ]
then
- Echo_message "Ignoring --config ${_CONFIG}: ${PWD} is already a git repository"
+ if [ "${1}" != "noauto" ]
+ then
+ Echo_message "Ignoring --config ${_CONFIG}: ${PWD} is already a git repository"
+ fi
+
_CONFIG=""
fi