diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-02-17 05:23:11 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-02-17 05:23:11 +0000 |
| commit | 5a491b9bc43a6ff59bae4c719f36907a21e9432a (patch) | |
| tree | d1fdeb368de26180703beb3ba5b15c1907576f8a | |
| parent | aaf49ad8dde352831e9af1ad646a68f3bbd93fdf (diff) | |
| download | portage-5a491b9bc43a6ff59bae4c719f36907a21e9432a.tar.gz portage-5a491b9bc43a6ff59bae4c719f36907a21e9432a.tar.bz2 portage-5a491b9bc43a6ff59bae4c719f36907a21e9432a.zip | |
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
| -rw-r--r-- | pym/portage/util.py | 5 |
1 files changed, 4 insertions, 1 deletions
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]), |