diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-02-20 03:59:45 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-02-20 03:59:45 +0000 |
commit | d7ad59ba79cb45292c261e611ee91e5a97b6d75a (patch) | |
tree | c5ccaa3f674a088d1f153586893e8fc6416088e0 | |
parent | 0e25e5158634241e0db8b166f22c5d224abfb0c1 (diff) | |
download | portage-d7ad59ba79cb45292c261e611ee91e5a97b6d75a.tar.gz portage-d7ad59ba79cb45292c261e611ee91e5a97b6d75a.tar.bz2 portage-d7ad59ba79cb45292c261e611ee91e5a97b6d75a.zip |
Make stack_dicts() treat an empty variable assignment just like a non-empty
assignment. This allows the profile to set and empty variable in make.defaults
and have it override a non-empty value as one would expect.
svn path=/main/trunk/; revision=9361
-rw-r--r-- | pym/portage/util.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/util.py b/pym/portage/util.py index deda2e2c3..97c785c06 100644 --- a/pym/portage/util.py +++ b/pym/portage/util.py @@ -168,7 +168,7 @@ def stack_dicts(dicts, incremental=0, incrementals=[], ignore_none=0): if final_dict is None: final_dict = {} for y in mydict.keys(): - if mydict[y]: + if True: if final_dict.has_key(y) and (incremental or (y in incrementals)): final_dict[y] += " "+mydict[y][:] else: |