From 588393196667708cdeeb3feae36908f8b3d061c8 Mon Sep 17 00:00:00 2001
From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Wed, 9 Jul 2008 04:59:23 +0100
Subject: Fix bug where command-line argument --ignore-system-default was not
seen before it was required.
---
helpers/lh_config | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/helpers/lh_config b/helpers/lh_config
index 5cbaa59..d4a1009 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -622,7 +622,6 @@ Local_arguments ()
;;
--ignore-system-defaults)
- _LH_IGNORE_SYSTEM_DEFAULTS="enabled"
shift
;;
@@ -660,7 +659,7 @@ Local_arguments ()
}
# Reading system configuration
-if [ -f "${SYSTEM_LH_CONFFILE}" ] && [ "${_LH_IGNORE_SYSTEM_DEFAULTS}" != "enabled" ]
+if [ -f "${SYSTEM_LH_CONFFILE}" ] && if ! In_list "--ignore-system-defaults" "${@}"
then
Echo_message "Using system defaults from ${SYSTEM_LH_CONFFILE}"
Read_conffile "${SYSTEM_LH_CONFFILE}"
--
cgit v1.0