Fix repoman breakage wrt _PackageMetadataWrapper._keys values.

svn path=/main/trunk/; revision=10783

diff --git a/bin/repoman b/bin/repoman
index be8730f6a71f834100e72905c8d31be3245fe5f7..e654495813c597ba201c186752b29e5a8d7f8753 100755 (executable)
--- 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 b5b7261515669e5b417207360ade86888ec0979b..2056d44a203b1c1c83afc485cc6c3ec3af7e390d 100644 (file)
--- 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_"])