diff options
| author | Daniel <dmoody256@gmail.com> | 2019-02-02 03:46:23 (GMT) |
|---|---|---|
| committer | Daniel <dmoody256@gmail.com> | 2019-02-02 03:46:23 (GMT) |
| commit | 3341dc63c5aeb892e38075927bfa3d1767f006d3 (patch) | |
| tree | bb386e2974dffb352259c46877977e310f08c906 /src/engine | |
| parent | dd340d59e070ff8fcff8a893b350a0dea5b4859b (diff) | |
| parent | 1e173918f5856ef0f45d291fa75c42bb4b0f51b9 (diff) | |
| download | SCons-3341dc63c5aeb892e38075927bfa3d1767f006d3.zip SCons-3341dc63c5aeb892e38075927bfa3d1767f006d3.tar.gz SCons-3341dc63c5aeb892e38075927bfa3d1767f006d3.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into mingw_link_issue
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Environment.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/EnvironmentTests.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index 81d0e5a..152f0bc 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -1217,7 +1217,7 @@ class Base(SubstitutionEnvironment): return path def AppendENVPath(self, name, newpath, envname = 'ENV', - sep = os.pathsep, delete_existing=1): + sep = os.pathsep, delete_existing=0): """Append path elements to the path 'name' in the 'ENV' dictionary for this environment. Will only add any particular path once, and will normpath and normcase all paths to help diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py index 7cd6015..a72c173 100644 --- a/src/engine/SCons/EnvironmentTests.py +++ b/src/engine/SCons/EnvironmentTests.py @@ -1623,9 +1623,9 @@ def exists(env): env1.AppendENVPath('PATH',r'C:\dir\num\two', sep = ';') env1.AppendENVPath('PATH',r'C:\dir\num\three', sep = ';') env1.AppendENVPath('MYPATH',r'C:\mydir\num\three','MYENV', sep = ';') - env1.AppendENVPath('MYPATH',r'C:\mydir\num\one','MYENV', sep = ';') + env1.AppendENVPath('MYPATH',r'C:\mydir\num\one','MYENV', sep = ';', delete_existing=1) # this should do nothing since delete_existing is 0 - env1.AppendENVPath('MYPATH',r'C:\mydir\num\three','MYENV', sep = ';', delete_existing=0) + env1.AppendENVPath('MYPATH',r'C:\mydir\num\three','MYENV', sep = ';') assert(env1['ENV']['PATH'] == r'C:\dir\num\one;C:\dir\num\two;C:\dir\num\three') assert(env1['MYENV']['MYPATH'] == r'C:\mydir\num\two;C:\mydir\num\three;C:\mydir\num\one') |