From 365e9a71e5dff59be90f4ca16eefb245031c1e7f Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 26 Aug 2010 22:43:31 -0700
Subject: Add a IUSE.missing repoman category for packages that have a USE
 conditional which references a flag that is not listed in IUSE. Also split
 out a Package._metadata_exception() method to handle IUSE.missing for *DEPEND
 and SRC_URI.

---
 pym/_emerge/Package.py      | 47 ++++++++++++++++++++++++---------------------
 pym/portage/dep/__init__.py |  8 +++++---
 pym/portage/exception.py    |  3 +++
 3 files changed, 33 insertions(+), 25 deletions(-)

(limited to 'pym')

diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index 495686ff4..f9b42f0de 100644
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -87,27 +87,7 @@ class Package(Task):
 				use_reduce(v, eapi=dep_eapi,
 					is_valid_flag=dep_valid_flag, token_class=Atom)
 			except portage.exception.InvalidDependString as e:
-				if not self.installed:
-					categorized_error = False
-					if e.errors:
-						for error in e.errors:
-							if getattr(error, 'category', None) is None:
-								continue
-							categorized_error = True
-							self._invalid_metadata(error.category,
-								"%s: %s" % (k, error))
-
-					if not categorized_error:
-						self._invalid_metadata(k + ".syntax",
-							"%s: %s" % (k, e))
-				else:
-					# For installed packages, show the path of the file
-					# containing the invalid metadata, since the user may
-					# want to fix the deps by hand.
-					vardb = self.root_config.trees['vartree'].dbapi
-					path = vardb.getpath(self.cpv, filename=k)
-					self._invalid_metadata(k + ".syntax",
-						"%s: %s in '%s'" % (k, e, path))
+				self._metadata_exception(k, e)
 
 		k = 'REQUIRED_USE'
 		v = self.metadata.get(k)
@@ -131,7 +111,7 @@ class Package(Task):
 					is_valid_flag=self.iuse.is_valid_flag)
 			except portage.exception.InvalidDependString as e:
 				if not self.installed:
-					self._invalid_metadata(k + ".syntax", "%s: %s" % (k, e))
+					self._metadata_exception(k, e)
 
 	def copy(self):
 		return Package(built=self.built, cpv=self.cpv, depth=self.depth,
@@ -216,6 +196,29 @@ class Package(Task):
 
 		return True
 
+	def _metadata_exception(self, k, e):
+		if not self.installed:
+			categorized_error = False
+			if e.errors:
+				for error in e.errors:
+					if getattr(error, 'category', None) is None:
+						continue
+					categorized_error = True
+					self._invalid_metadata(error.category,
+						"%s: %s" % (k, error))
+
+			if not categorized_error:
+				self._invalid_metadata(k + ".syntax",
+					"%s: %s" % (k, e))
+		else:
+			# For installed packages, show the path of the file
+			# containing the invalid metadata, since the user may
+			# want to fix the deps by hand.
+			vardb = self.root_config.trees['vartree'].dbapi
+			path = vardb.getpath(self.cpv, filename=k)
+			self._invalid_metadata(k + ".syntax",
+				"%s: %s in '%s'" % (k, e, path))
+
 	def _invalid_metadata(self, msg_type, msg):
 		if self.invalid is None:
 			self.invalid = {}
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 499b43fc0..36b655f7c 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -307,9 +307,11 @@ def use_reduce(depstr, uselist=[], masklist=[], matchall=False, excludeall=[], i
 		
 		if is_valid_flag:
 			if not is_valid_flag(flag):
-				raise portage.exception.InvalidDependString(
-					_("use flag '%s' is not referencable in conditional '%s' (flag missing from IUSE?)") \
-						% (flag, conditional))
+				msg = _("USE flag '%s' referenced in " + \
+					"conditional '%s' is not in IUSE") \
+					% (flag, conditional)
+				e = InvalidData(msg, category='IUSE.missing')
+				raise portage.exception.InvalidDependString(msg, errors=(e,))
 		else:
 			if _valid_use_re.match(flag) is None:
 				raise portage.exception.InvalidDependString(
diff --git a/pym/portage/exception.py b/pym/portage/exception.py
index b289b6285..9564af98a 100644
--- a/pym/portage/exception.py
+++ b/pym/portage/exception.py
@@ -52,6 +52,9 @@ class ParseError(PortageException):
 
 class InvalidData(PortageException):
 	"""An incorrect formatting was passed instead of the expected one"""
+	def __init__(self, value, category=None):
+		PortageException.__init__(self, value)
+		self.category = category
 
 class InvalidDataType(PortageException):
 	"""An incorrect type was passed instead of the expected one"""
-- 
cgit v1.2.3-1-g7c22