[patch] fix AttributeError for invalid binpkgs that have no CATEGORY data

invalid_binpkg.patch (text/plain), 1.27 KB, created by Zac Medico on 2006-10-28 15:01:41 UTC

Index: pym/portage.py
===================================================================
--- pym/portage.py	(revision 4867)
+++ pym/portage.py	(revision 4868)
@@ -5612,8 +5612,10 @@
 		mypath = os.path.join("All", myfile)
 		dest_path = os.path.join(self.pkgdir, mypath)
 		if os.path.exists(dest_path):
-			other_cat = xpak.tbz2(dest_path).getfile("CATEGORY").strip()
+			# For invalid packages, other_cat could be None.
+			other_cat = xpak.tbz2(dest_path).getfile("CATEGORY")
 			if other_cat:
+				other_cat = other_cat.strip()
 				self._move_from_all(other_cat + "/" + mypkg)
 		"""The file may or may not exist. Move it if necessary and update
 		internal state for future calls to getname()."""
@@ -5680,7 +5682,8 @@
 					if os.path.islink(full_path):
 						continue
 					mytbz2 = xpak.tbz2(full_path)
-					mycat = mytbz2.getfile("CATEGORY").strip()
+					# For invalid packages, mycat could be None.
+					mycat = mytbz2.getfile("CATEGORY")
 					mypkg = myfile[:-5]
 					if not mycat:
 						#old-style or corrupt package
@@ -5690,6 +5693,7 @@
 							"recoverable and should be deleted.\n",
 							noiselevel=-1)
 						self.invalids.append(mypkg)
+					mycat = mycat.strip()
 					if mycat != mydir and mydir != "All":
 						continue
 					if mypkg != mytbz2.getfile("PF").strip():