From 98aa1f4243df6d1c7e2b4cd10b8abab450263fe6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 23 Jan 2007 20:42:43 +0000 Subject: [PATCH] For bug #163219, handle binpkgs that have missing PF metadata. (trunk r5756:5757) svn path=/main/branches/2.1.2/; revision=5761 --- pym/portage.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 050a8fb64..9070a04d1 100644 --- 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: -- 2.26.2