Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10783 - in main/trunk: bin pym/_emerge
Date: Wed, 25 Jun 2008 12:41:29
Message-Id: E1KBUJP-0005lD-JK@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-06-25 12:41:22 +0000 (Wed, 25 Jun 2008)
3 New Revision: 10783
4
5 Modified:
6 main/trunk/bin/repoman
7 main/trunk/pym/_emerge/__init__.py
8 Log:
9 Fix repoman breakage wrt _PackageMetadataWrapper._keys values.
10
11
12 Modified: main/trunk/bin/repoman
13 ===================================================================
14 --- main/trunk/bin/repoman 2008-06-25 10:06:42 UTC (rev 10782)
15 +++ main/trunk/bin/repoman 2008-06-25 12:41:22 UTC (rev 10783)
16 @@ -357,7 +357,8 @@
17 ]
18
19 missingvars=["KEYWORDS","LICENSE","DESCRIPTION","HOMEPAGE","SLOT"]
20 -allvars = set(portage.auxdbkeys)
21 +allvars = set(x for x in portage.auxdbkeys if not x.startswith("UNUSED_"))
22 +allvars.discard("CDEPEND")
23 allvars.update(Package.metadata_keys)
24 allvars = sorted(allvars)
25 commitmessage=None
26
27 Modified: main/trunk/pym/_emerge/__init__.py
28 ===================================================================
29 --- main/trunk/pym/_emerge/__init__.py 2008-06-25 10:06:42 UTC (rev 10782)
30 +++ main/trunk/pym/_emerge/__init__.py 2008-06-25 12:41:22 UTC (rev 10783)
31 @@ -1375,7 +1375,11 @@
32 """
33 Detect metadata updates and synchronize Package attributes.
34 """
35 - _keys = Package.metadata_keys
36 + _keys = set(x for x in portage.auxdbkeys \
37 + if not x.startswith("UNUSED_"))
38 + _keys.discard("CDEPEND")
39 + _keys.update(Package.metadata_keys)
40 + _keys = tuple(sorted(_keys))
41 __slots__ = ("__weakref__", "_pkg") + tuple("_val_" + k for k in _keys)
42 _wrapped_keys = frozenset(
43 ["COUNTER", "INHERITED", "IUSE", "SLOT", "USE", "_mtime_"])
44
45 --
46 gentoo-commits@l.g.o mailing list