diff options
| author | Steven Knight <knight@baldmt.com> | 2004-03-26 07:59:13 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-03-26 07:59:13 (GMT) |
| commit | d8dc50c28a3eeac4a73533140b44e4bd73b8797e (patch) | |
| tree | e59d5e6d922bec380ff9bda569f612a200ccd0e2 /src/engine/SCons/Environment.py | |
| parent | 5b3b7a9401f4dd9397cd753740cda263b0fa7d61 (diff) | |
| download | SCons-d8dc50c28a3eeac4a73533140b44e4bd73b8797e.zip SCons-d8dc50c28a3eeac4a73533140b44e4bd73b8797e.tar.gz SCons-d8dc50c28a3eeac4a73533140b44e4bd73b8797e.tar.bz2 | |
Rework the env.Append() and env.Prepend() tests.
Diffstat (limited to 'src/engine/SCons/Environment.py')
| -rw-r--r-- | src/engine/SCons/Environment.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index 0edff88..dc52ee1 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -667,10 +667,14 @@ class Base: self._dict[key] = kw[key] elif SCons.Util.is_List(self._dict[key]) and not \ SCons.Util.is_List(kw[key]): - self._dict[key] = [ kw[key] ] + self._dict[key] + if kw[key]: + self._dict[key] = [ kw[key] ] + self._dict[key] elif SCons.Util.is_List(kw[key]) and not \ SCons.Util.is_List(self._dict[key]): - self._dict[key] = kw[key] + [ self._dict[key] ] + if self._dict[key]: + self._dict[key] = kw[key] + [ self._dict[key] ] + else: + self._dict[key] = kw[key] elif SCons.Util.is_Dict(self._dict[key]) and \ SCons.Util.is_Dict(kw[key]): self._dict[key].update(kw[key]) |