From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 17 Feb 2009 05:23:11 +0000 (-0000)
Subject: Fix grabfile_package() to preprocess atoms before passing them to
X-Git-Tag: v2.2_rc24~183
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a491b9bc43a6ff59bae4c719f36907a21e9432a;p=portage.git

Fix grabfile_package() to preprocess atoms before passing them to
isvalidatom() because isvalidatom() has gotten more strict since r12614.
Thanks to ABCD for reporting.

svn path=/main/trunk/; revision=12622
---

diff --git a/pym/portage/util.py b/pym/portage/util.py
index def0d3e40..18bbe577b 100644
--- a/pym/portage/util.py
+++ b/pym/portage/util.py
@@ -281,7 +281,10 @@ def grabfile_package(myfilename, compatlevel=0, recursive=0):
 	pkgs=grabfile(myfilename, compatlevel, recursive=recursive)
 	for x in range(len(pkgs)-1, -1, -1):
 		pkg = pkgs[x]
-		if pkg[0] in '-*': # -atom *pkg for packages file
+		# for packages and package.mask files
+		if pkg[:1] == "-":
+			pkg = pkg[1:]
+		if pkg[:1] == "*":
 			pkg = pkg[1:]
 		if not isvalidatom(pkg):
 			writemsg("--- Invalid atom in %s: %s\n" % (myfilename, pkgs[x]),