From e7b84be269957aad287e5aeb4cb1bed6cd84e45a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 28 Mar 2008 09:24:10 +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. (trunk r9361) svn path=/main/branches/2.1.2/; revision=9532 --- pym/portage_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pym/portage_util.py') diff --git a/pym/portage_util.py b/pym/portage_util.py index 902ed091f..bad313bdc 100644 --- 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: -- cgit v1.2.3-1-g7c22