[gentoo-commits] portage r10783 - in main/trunk: bin pym/_emerge

[gentoo-commits] portage r10783 - in main/trunk: bin pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-06-25 12:41:22 +0000 (Wed, 25 Jun 2008)
New Revision: 10783

Modified:
   main/trunk/bin/repoman
   main/trunk/pym/_emerge/__init__.py
Log:
Fix repoman breakage wrt _PackageMetadataWrapper._keys values.


Modified: main/trunk/bin/repoman
===================================================================
--- main/trunk/bin/repoman	2008-06-25 10:06:42 UTC (rev 10782)
+++ main/trunk/bin/repoman	2008-06-25 12:41:22 UTC (rev 10783)
@@ -357,7 +357,8 @@
 ]
 
 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

Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-06-25 10:06:42 UTC (rev 10782)
+++ main/trunk/pym/_emerge/__init__.py	2008-06-25 12:41:22 UTC (rev 10783)
@@ -1375,7 +1375,11 @@
 	"""
 	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_"])

-- 
gentoo-commits@lists.gentoo.org mailing list