diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-07-09 04:59:23 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:36 +0100 |
| commit | 588393196667708cdeeb3feae36908f8b3d061c8 (patch) | |
| tree | b0cbbd7ab6e07d0693d563e1b9eb5cf31786a634 | |
| parent | 6e64be0c82ff648faae2bb09e3c28a4c9aa9b478 (diff) | |
| download | live-build-588393196667708cdeeb3feae36908f8b3d061c8.zip live-build-588393196667708cdeeb3feae36908f8b3d061c8.tar.gz | |
Fix bug where command-line argument --ignore-system-default was not seen before it was required.
| -rwxr-xr-x | helpers/lh_config | 3 |
1 files changed, 1 insertions, 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}" |