From d7ad59ba79cb45292c261e611ee91e5a97b6d75a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 20 Feb 2008 03:59:45 +0000 Subject: 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 --- pym/portage/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- cgit v1.2.3-1-g7c22