diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-01-22 11:24:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-01-22 11:24:45 +0000 |
| commit | 5e00dcba1c377b27a81de6d973f161a5e49ac064 (patch) | |
| tree | af08f340385de71f3de0e358b14c28c1f6efc7a1 | |
| parent | 01db74cf9776abfb86918d633d77c1bad5040b27 (diff) | |
| download | portage-5e00dcba1c377b27a81de6d973f161a5e49ac064.tar.gz portage-5e00dcba1c377b27a81de6d973f161a5e49ac064.tar.bz2 portage-5e00dcba1c377b27a81de6d973f161a5e49ac064.zip | |
For bug #163219, handle binpkgs that have missing PF metadata.
svn path=/main/trunk/; revision=5757
| -rw-r--r-- | pym/portage.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index 8d30da9c4..c4dce04ac 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6518,8 +6518,9 @@ class binarytree(object): mytbz2 = xpak.tbz2(full_path) # For invalid packages, mycat could be None. mycat = mytbz2.getfile("CATEGORY") + mypf = mytbz2.getfile("PF") mypkg = myfile[:-5] - if not mycat: + if not mycat or not mypf: #old-style or corrupt package writemsg("!!! Invalid binary package: '%s'\n" % full_path, noiselevel=-1) @@ -6531,7 +6532,7 @@ class binarytree(object): mycat = mycat.strip() if mycat != mydir and mydir != "All": continue - if mypkg != mytbz2.getfile("PF").strip(): + if mypkg != mypf.strip(): continue mycpv = mycat + "/" + mypkg if mycpv in pkg_paths: |