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. (trunk r9361)

svn path=/main/branches/2.1.2/; revision=9532

diff --git a/pym/portage_util.py b/pym/portage_util.py
index 902ed091ff3c079c3bb6e725b2f2aa086419786b..bad313bdc822cc9d26f00f0355bb8c3da1b93668 100644 (file)
--- a/pym/portage_util.py
+++ b/pym/portage_util.py
@@ -159,7 +159,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: