diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 05:19:19 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 05:19:19 +0000 |
| commit | 00bde9e4f190c5e167c8b926d44bf341657ec816 (patch) | |
| tree | 0c4527e71e2f830196d16aa66770ae6438bcaa75 /pym | |
| parent | 7f414eba7b149ee65223a42f9ac4e88fa1b0bac0 (diff) | |
| download | portage-00bde9e4f190c5e167c8b926d44bf341657ec816.tar.gz portage-00bde9e4f190c5e167c8b926d44bf341657ec816.tar.bz2 portage-00bde9e4f190c5e167c8b926d44bf341657ec816.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. (trunk r12622)
svn path=/main/branches/2.1.6/; revision=12897
Diffstat (limited to 'pym')
| -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]), |