From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 22 Jan 2007 11:24:45 +0000 (-0000)
Subject: For bug #163219, handle binpkgs that have missing PF metadata.
X-Git-Tag: v2.1.2-r3~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e00dcba1c377b27a81de6d973f161a5e49ac064;p=portage.git

For bug #163219, handle binpkgs that have missing PF metadata.

svn path=/main/trunk/; revision=5757
---

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: