For bug #163219, handle binpkgs that have missing PF metadata. (trunk r5756:5757)

svn path=/main/branches/2.1.2/; revision=5761

diff --git a/pym/portage.py b/pym/portage.py
index 050a8fb64c02073f1108246314190488d19a78d6..9070a04d1576a31e91371e66b222ac8edbf407de 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6453,8 +6453,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)
@@ -6466,7 +6467,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: