From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 11 Mar 2009 05:19:19 +0000 (-0000)
Subject: Fix grabfile_package() to preprocess atoms before passing them to
X-Git-Tag: v2.1.6.8~180
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=00bde9e4f190c5e167c8b926d44bf341657ec816;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. (trunk r12622)

svn path=/main/branches/2.1.6/; revision=12897
---

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]),