Make grabfile_package() accept *atom only for files named 'packages' since

they are not valid in any other files.

svn path=/main/trunk/; revision=14225

diff --git a/pym/portage/util.py b/pym/portage/util.py
index f6f21f586202707b0781b1f9e86b511eccab4e71..3232a4e516d27b40fa3d77aa4a207f7aafedeeca 100644 (file)
--- a/pym/portage/util.py
+++ b/pym/portage/util.py
@@ -306,13 +306,14 @@ def grabdict_package(myfilename, juststrings=0, recursive=0):
 
 def grabfile_package(myfilename, compatlevel=0, recursive=0):
        pkgs=grabfile(myfilename, compatlevel, recursive=recursive)
+       mybasename = os.path.basename(myfilename)
        atoms = []
        for pkg in pkgs:
                pkg_orig = pkg
                # for packages and package.mask files
                if pkg[:1] == "-":
                        pkg = pkg[1:]
-               if pkg[:1] == "*":
+               if pkg[:1] == '*' and mybasename == 'packages':
                        pkg = pkg[1:]
                try:
                        pkg = Atom(pkg)