manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug where command-line argument --ignore-system-default was not seen before it was required.

This commit is contained in:
Chris Lamb 2008-07-09 04:59:23 +01:00 committed by Daniel Baumann
parent 6e64be0c82
commit 5883931966
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
helpers/lh_config
View File

@ -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}"