In config.setcpv(), don't add empty values to self.configdict['pkg'] for
authorZac Medico <zmedico@gentoo.org>
Thu, 30 Apr 2009 07:03:06 +0000 (07:03 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 30 Apr 2009 07:03:06 +0000 (07:03 -0000)
keys that don't exist in the given dict. (trunk r13310)

svn path=/main/branches/2.1.6/; revision=13481

pym/portage/__init__.py

index a0b93747c74cf19dc218c76dc1400d6edc4c5c24..deb15022703ed76de399a8680d5785e293e3aaa2 100644 (file)
@@ -2120,7 +2120,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