From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 14 Nov 2012 03:17:24 +0000 (-0800)
Subject: repoman: validate use restrict atoms, bug #442786
X-Git-Tag: v2.2.0_alpha143~41
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=118db4184de67450ec7118f1607b3f8c8ed1ec9e;p=portage.git

repoman: validate use restrict atoms, bug #442786
---

diff --git a/bin/repoman b/bin/repoman
index 553b1d20f..91a98153b 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -69,8 +69,9 @@ import portage.checksum
 import portage.const
 from portage import cvstree, normalize_path
 from portage import util
-from portage.exception import (FileNotFound, MissingParameter,
+from portage.exception import (FileNotFound, InvalidAtom, MissingParameter,
 	ParseError, PermissionDenied)
+from portage.dep import Atom
 from portage.process import find_binary, spawn
 from portage.output import bold, create_color_func, \
 	green, nocolor, red
@@ -1661,6 +1662,22 @@ for x in effective_scanlist:
 				metadata_bad = True
 				stats["metadata.bad"] += 1
 				fails["metadata.bad"].append("%s/metadata.xml: %s" % (x, e))
+			else:
+				for atom in chain(*musedict.values()):
+					if atom is None:
+						continue
+					try:
+						atom = Atom(atom)
+					except InvalidAtom as e:
+						stats["metadata.bad"] += 1
+						fails["metadata.bad"].append(
+							"%s/metadata.xml: Invalid atom: %s" % (x, e))
+					else:
+						if atom.cp != x:
+							stats["metadata.bad"] += 1
+							fails["metadata.bad"].append(
+								("%s/metadata.xml: Atom contains "
+								"unexpected cat/pn: %s") % (x, atom))
 
 			# Run other metadata.xml checkers
 			try:
diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py
index f29a177f0..908fb2d20 100644
--- a/pym/portage/tests/repoman/test_simple.py
+++ b/pym/portage/tests/repoman/test_simple.py
@@ -133,7 +133,7 @@ class SimpleRepomanTestCase(TestCase):
 				"dev-libs/A",
 				{
 					"herd" : "base-system",
-					"flags" : "<flag name='flag'>Description of how USE='flag' affects this package</flag>",
+					"flags" : "<flag name='flag' restrict='&gt;=dev-libs/A-0'>Description of how USE='flag' affects this package</flag>",
 				},
 			),
 			(