emerge-2.0.45-r5.patch

emerge-2.0.45-r5.patch (text/plain), 1.89 KB, created by Doug Goldstein (RETIRED) on 2002-12-14 20:06:41 UTC

--- emerge.old	Sat Dec 14 20:50:58 2002
+++ emerge	Sat Dec 14 20:40:49 2002
@@ -1006,22 +1006,23 @@
 					print "["+x[0]+" "+addl+"]",x[2],myoldbest
 
 			mysplit=portage.pkgsplit(x[2])
-			if not "--emptytree" in myopts:
-				if mysplit[0]=="sys-apps/portage":
-					if mysplit[1]+"-"+mysplit[2]!=portage.VERSION:
-						if mylist.index(x)<len(mylist)-1:
-							print red("*** Portage will stop merging at this point and reload itself,")
-							print red("    recalculate dependancies, and complete the merge.")
-							if not "--update" in myopts:
-								print darkgreen("    You may avoid the remerging of packages by updating portage on its own.")
+			if mysplit != None:
+				if not "--emptytree" in myopts:
+					if mysplit[0]=="sys-apps/portage":
+						if mysplit[1]+"-"+mysplit[2]!=portage.VERSION:
+							if mylist.index(x)<len(mylist)-1:
+								print red("*** Portage will stop merging at this point and reload itself,")
+								print red("    recalculate dependancies, and complete the merge.")
+								if not "--update" in myopts:
+									print darkgreen("    You may avoid the remerging of packages by updating portage on its own.")
+								print
+				else:
+					if mysplit[0]=="sys-apps/portage":
+						if mysplit[1]+"-"+mysplit[2]!=portage.VERSION:
+							print red("!!!")+" Please update portage to the above version before proceeding."
+							print "    Failure to do so may result in failed or improper merges."
+							print "    A simple '"+green("emerge -u portage")+"' is sufficient."
 							print
-			else:
-				if mysplit[0]=="sys-apps/portage":
-					if mysplit[1]+"-"+mysplit[2]!=portage.VERSION:
-						print red("!!!")+" Please update portage to the above version before proceeding."
-						print "    Failure to do so may result in failed or improper merges."
-						print "    A simple '"+green("emerge -u portage")+"' is sufficient."
-						print
 			del mysplit
 
 	def outdated(self):