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

diff --git a/pym/portage/util.py b/pym/portage/util.py
index deda2e2c30b8c7c75956cc2ba3b591ef342f1339..97c785c06f8152ee051320546dd98d5195ae8295 100644 (file)
--- 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: