From 4e65bcbb5b2472227ca59e25fd72a4857324e508 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 13 Dec 2012 19:04:14 +0100
Subject: Avoid re-populating an already populated configuration tree when
 using lb config --config.

---
 scripts/build/config | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'scripts')

diff --git a/scripts/build/config b/scripts/build/config
index b563ee955..33429bb8d 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -872,6 +872,16 @@ then
 	_CONFIG=""
 fi
 
+if [ -e .build/config ] && [ -n "${_CONFIG}" ]
+then
+	if [ "${1}" != "noauto" ]
+	then
+		Echo_message "Ignoring --config ${_CONFIG}: ${PWD} is already a live-build configuration tree"
+	fi
+
+	_CONFIG=""
+fi
+
 if [ -n "${_CONFIG}" ]
 then
 	if [ -e "${_CONFIG}" ] || [ -e "/usr/share/live/images/${_CONFIG}" ]
-- 
cgit v1.2.3