From 58108f0efd5a6b3864f54b188dbbffeeb0b07d8a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 25 Jun 2008 12:41:22 +0000 Subject: Fix repoman breakage wrt _PackageMetadataWrapper._keys values. svn path=/main/trunk/; revision=10783 --- bin/repoman | 3 ++- pym/_emerge/__init__.py | 6 +++++- 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_"]) -- cgit v1.2.3-1-g7c22