diff options
| author | Steven Knight <knight@baldmt.com> | 2005-11-06 03:25:46 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-11-06 03:25:46 (GMT) |
| commit | ad6055f3ff5ec00a381fc989209c8db4dd59170d (patch) | |
| tree | 109573cb233feccb33e0e796ec58361ddbff69b3 /src/engine/SCons/Environment.py | |
| parent | f36e4322dc8e4fae14fe728009c7581e8a6c51ac (diff) | |
| download | SCons-ad6055f3ff5ec00a381fc989209c8db4dd59170d.zip SCons-ad6055f3ff5ec00a381fc989209c8db4dd59170d.tar.gz SCons-ad6055f3ff5ec00a381fc989209c8db4dd59170d.tar.bz2 | |
Fix AppendUnique and PrependUnique concatenating strings to lists. (Patrick Mezard)
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 ce8e374..3834636 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -747,8 +747,10 @@ class Base(SubstitutionEnvironment): else: dk = self._dict[key] if SCons.Util.is_List(dk): + # By elimination, val is not a list. Since dk is a + # list, wrap val in a list first. if not val in dk: - self._dict[key] = dk + val + self._dict[key] = dk + [val] else: self._dict[key] = self._dict[key] + val self.scanner_map_delete(kw) @@ -1044,8 +1046,10 @@ class Base(SubstitutionEnvironment): else: dk = self._dict[key] if SCons.Util.is_List(dk): + # By elimination, val is not a list. Since dk is a + # list, wrap val in a list first. if not val in dk: - self._dict[key] = val + dk + self._dict[key] = [val] + dk else: self._dict[key] = val + dk self.scanner_map_delete(kw) |