summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-10 00:10:24 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-10 00:10:24 +0000
commit46abb3e7b0386422960e01e5adc27f2a25fc2973 (patch)
treed27c470dc09dcfb36ea72c6d22d85d18852ac1b1
parentc8d1f19082a1f89125189678b4394089a3d8dd31 (diff)
downloadportage-46abb3e7b0386422960e01e5adc27f2a25fc2973.tar.gz
portage-46abb3e7b0386422960e01e5adc27f2a25fc2973.tar.bz2
portage-46abb3e7b0386422960e01e5adc27f2a25fc2973.zip
In config.setcpv(), don't add empty values to self.configdict['pkg'] for
keys that don't exist in the given dict. svn path=/main/trunk/; revision=13310
-rw-r--r--pym/portage/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index a914f2f32..65ee6e5c8 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2130,7 +2130,9 @@ class config(object):
if mydb:
if not hasattr(mydb, "aux_get"):
for k in aux_keys:
- pkg_configdict[k] = mydb.get(k, '')
+ v = mydb.get(k)
+ if v is not None:
+ pkg_configdict[k] = v
else:
for k, v in izip(aux_keys, mydb.aux_get(self.mycpv, aux_keys)):
pkg_configdict[k] = v