From dd6f9b7cfae47067f86a39827e40475883432331 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 19 Feb 2013 10:00:45 +0100
Subject: [PATCH] Making messages about reading system conffiles in lb config
more accurate.
---
scripts/build/config | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/scripts/build/config b/scripts/build/config
index 6b4c3f680..d1d820a6b 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -925,11 +925,16 @@ then
fi
# Reading system configuration
-if ! In_list "--ignore-system-defaults" "${@}"
+if ls /etc/live/build.conf > /dev/null 2>&1 || ls /etc/live/build/* > /dev/null 2>&1
then
- Echo_message "Considering defaults defined in %s" "/etc/live/build.conf"
+ if In_list "--ignore-system-defaults" "${@}"
+ then
+ Echo_message "Ignoring defaults in %s" "/etc/live/build.conf"
+ else
+ Echo_message "Using defaults in %s" "/etc/live/build.conf"
- Read_conffiles /etc/live/build.conf /etc/live/build/*
+ Read_conffiles /etc/live/build.conf /etc/live/build/*
+ fi
fi
# Reading existing configuration