Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13481 - main/branches/2.1.6/pym/portage
Date: Thu, 30 Apr 2009 07:03:09
Message-Id: E1LzQIV-0006tM-2F@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-04-30 07:03:06 +0000 (Thu, 30 Apr 2009)
3 New Revision: 13481
4
5 Modified:
6 main/branches/2.1.6/pym/portage/__init__.py
7 Log:
8 In config.setcpv(), don't add empty values to self.configdict['pkg'] for
9 keys that don't exist in the given dict. (trunk r13310)
10
11 Modified: main/branches/2.1.6/pym/portage/__init__.py
12 ===================================================================
13 --- main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 07:02:47 UTC (rev 13480)
14 +++ main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 07:03:06 UTC (rev 13481)
15 @@ -2120,7 +2120,9 @@
16 if mydb:
17 if not hasattr(mydb, "aux_get"):
18 for k in aux_keys:
19 - pkg_configdict[k] = mydb.get(k, '')
20 + v = mydb.get(k)
21 + if v is not None:
22 + pkg_configdict[k] = v
23 else:
24 for k, v in izip(aux_keys, mydb.aux_get(self.mycpv, aux_keys)):
25 pkg_configdict[k] = v