[gentoo-commits] portage r13726 - main/trunk/pym/_emerge

[gentoo-commits] portage r13726 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-06-28 19:03:33 +0000 (Sun, 28 Jun 2009)
New Revision: 13726

Modified:
   main/trunk/pym/_emerge/Package.py
   main/trunk/pym/_emerge/depgraph.py
Log:
Make Package.invalid suitable for use by repoman.


Modified: main/trunk/pym/_emerge/Package.py
===================================================================
--- main/trunk/pym/_emerge/Package.py	2009-06-28 18:40:05 UTC (rev 13725)
+++ main/trunk/pym/_emerge/Package.py	2009-06-28 19:03:33 UTC (rev 13726)
@@ -52,10 +52,14 @@
 		self.cpv_split = portage.catpkgsplit(self.cpv)
 		self.pv_split = self.cpv_split[1:]
 
-	def _invalid_metadata(self, msg):
+	def _invalid_metadata(self, msg_type, msg):
 		if self.invalid is None:
-			self.invalid = []
-		self.invalid.append(msg)
+			self.invalid = {}
+		msgs = self.invalid.get(msg_type)
+		if msgs is None:
+			msgs = []
+			self.invalid[msg_type] = msgs
+		msgs.append(msg)
 
 	class _use_class(object):
 
@@ -217,7 +221,7 @@
 			try:
 				use_reduce(paren_reduce(v), matchall=1)
 			except portage.exception.InvalidDependString, e:
-				self._pkg._invalid_metadata("%s: %s" % (k, e))
+				self._pkg._invalid_metadata(k + ".syntax", "%s: %s" % (k, e))
 
 	def _set_inherited(self, k, v):
 		if isinstance(v, basestring):

Modified: main/trunk/pym/_emerge/depgraph.py
===================================================================
--- main/trunk/pym/_emerge/depgraph.py	2009-06-28 18:40:05 UTC (rev 13725)
+++ main/trunk/pym/_emerge/depgraph.py	2009-06-28 19:03:33 UTC (rev 13726)
@@ -4898,8 +4898,9 @@
 			mreasons.append("CHOST: %s" % \
 				pkg.metadata["CHOST"])
 		if pkg.invalid:
-			for msg in pkg.invalid:
-				mreasons.append("invalid: %s" % (msg,))
+			for msg_type, msgs in pkg.invalid.iteritems():
+				for msg in msgs:
+					mreasons.append("invalid: %s" % (msg,))
 
 	if not pkg.metadata["SLOT"]:
 		mreasons.append("invalid: SLOT is undefined")