Attachment #107771 for bug #163219

View | Details | Raw Unified | Return to bug 163219
Collapse All | Expand All




					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 or not mypf:
						#old-style or corrupt package
						writemsg("!!! Invalid binary package: '%s'\n" % full_path,
							noiselevel=-1)

					mycat = mycat.strip()
					if mycat != mydir and mydir != "All":
						continue
					if mypkg != mypf.strip():
						continue
					mycpv = mycat + "/" + mypkg
					if mycpv in pkg_paths:

Return to bug 163219

Lines 6518-6525 Link Here

(-)pym/portage.py (-2 / +3 lines)
6518	mytbz2 = xpak.tbz2(full_path)	6518	mytbz2 = xpak.tbz2(full_path)
6519	# For invalid packages, mycat could be None.	6519	# For invalid packages, mycat could be None.
6520	mycat = mytbz2.getfile("CATEGORY")	6520	mycat = mytbz2.getfile("CATEGORY")
		6521	mypf = mytbz2.getfile("PF")
6521	mypkg = myfile[:-5]	6522	mypkg = myfile[:-5]
6522	if not mycat:	6523	if not mycat or not mypf:
6523	#old-style or corrupt package	6524	#old-style or corrupt package
6524	writemsg("!!! Invalid binary package: '%s'\n" % full_path,	6525	writemsg("!!! Invalid binary package: '%s'\n" % full_path,
6525	noiselevel=-1)	6526	noiselevel=-1)
Lines 6531-6537 Link Here
6531	mycat = mycat.strip()	6532	mycat = mycat.strip()
6532	if mycat != mydir and mydir != "All":	6533	if mycat != mydir and mydir != "All":
6533	continue	6534	continue
6534	if mypkg != mytbz2.getfile("PF").strip():	6535	if mypkg != mypf.strip():
6535	continue	6536	continue
6536	mycpv = mycat + "/" + mypkg	6537	mycpv = mycat + "/" + mypkg
6537	if mycpv in pkg_paths:	6538	if mycpv in pkg_paths: