mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-22 07:42:02 +00:00
Scons: command line arguments may be overwritten when building tools are loaded
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15237 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
48988ff296
commit
ba81af5fb2
@ -529,6 +529,9 @@ def setEnvVariable(env, name, required = None, default = None, split = True):
|
|||||||
'''
|
'''
|
||||||
# 1. ARGUMENTS is already set to env[name], override default.
|
# 1. ARGUMENTS is already set to env[name], override default.
|
||||||
if ARGUMENTS.has_key(name):
|
if ARGUMENTS.has_key(name):
|
||||||
|
# env[name] may be rewritten when building tools are reloaded
|
||||||
|
# if that is the case, commandline option will override it.
|
||||||
|
env[name] = ARGUMENTS[name]
|
||||||
default = None
|
default = None
|
||||||
# then use environment default
|
# then use environment default
|
||||||
elif os.environ.has_key(name):
|
elif os.environ.has_key(name):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user