summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-25 12:41:22 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-25 12:41:22 +0000
commit58108f0efd5a6b3864f54b188dbbffeeb0b07d8a (patch)
tree1ab4d08b3c8748608bc4288f5369a859409a80b8
parentdb0da5c2732387f9e935d0603efd01b51267470e (diff)
downloadportage-58108f0efd5a6b3864f54b188dbbffeeb0b07d8a.tar.gz
portage-58108f0efd5a6b3864f54b188dbbffeeb0b07d8a.tar.bz2
portage-58108f0efd5a6b3864f54b188dbbffeeb0b07d8a.zip
Fix repoman breakage wrt _PackageMetadataWrapper._keys values.
svn path=/main/trunk/; revision=10783
-rwxr-xr-xbin/repoman3
-rw-r--r--pym/_emerge/__init__.py6
2 files changed, 7 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index be8730f6a..e65449581 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -357,7 +357,8 @@ qawarnings=[
]
missingvars=["KEYWORDS","LICENSE","DESCRIPTION","HOMEPAGE","SLOT"]
-allvars = set(portage.auxdbkeys)
+allvars = set(x for x in portage.auxdbkeys if not x.startswith("UNUSED_"))
+allvars.discard("CDEPEND")
allvars.update(Package.metadata_keys)
allvars = sorted(allvars)
commitmessage=None
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index b5b726151..2056d44a2 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1375,7 +1375,11 @@ class _PackageMetadataWrapper(object):
"""
Detect metadata updates and synchronize Package attributes.
"""
- _keys = Package.metadata_keys
+ _keys = set(x for x in portage.auxdbkeys \
+ if not x.startswith("UNUSED_"))
+ _keys.discard("CDEPEND")
+ _keys.update(Package.metadata_keys)
+ _keys = tuple(sorted(_keys))
__slots__ = ("__weakref__", "_pkg") + tuple("_val_" + k for k in _keys)
_wrapped_keys = frozenset(
["COUNTER", "INHERITED", "IUSE", "SLOT", "USE", "_mtime_"])