[patch] pretend_in_slots.patch

pretend_in_slots.patch (text/plain), 1.51 KB, created by TGL on 2003-08-25 13:52:43 UTC

--- bin/emerge.orig	2003-08-25 22:50:12.000000000 +0200
+++ bin/emerge	2003-08-25 22:51:50.000000000 +0200
@@ -1031,22 +1031,19 @@
 				if (not "--emptytree" in myopts) and portage.db[x[1]]["vartree"].exists_specific(x[2]):
 					addl="  "+yellow("R")+fetch+"  "
 				elif (not "--emptytree" in myopts) and portage.db[x[1]]["vartree"].exists_specific_cat(x[2]):
-					myoldbest=portage.best(portage.db[x[1]]["vartree"].dbapi.match(portage.pkgsplit(x[2])[0]))
-
-					try:
-						myoldslot=portage.db[portage.root]["vartree"].getslot(myoldbest)
-					except:
-						myoldslot=None
 					mynewslot=portage.portdb.aux_get(x[2],["SLOT"])[0]
-
-					addl="   "+fetch
-					if (myoldslot==mynewslot) and portage.pkgcmp(portage.pkgsplit(x[2]), portage.pkgsplit(myoldbest)) < 0:
-						addl+=turquoise("U")+blue("D")
-					else:
-						if myoldslot:
-							addl+=turquoise("U")+" "
+					myoldlist=portage.db[x[1]]["vartree"].dbapi.match(portage.pkgsplit(x[2])[0])
+					myinslotlist=filter((lambda p: portage.db[portage.root]["vartree"].getslot(p)==mynewslot),myoldlist)
+					if myinslotlist:
+						myoldbest=portage.best(myinslotlist)
+						addl="   "+fetch
+						if portage.pkgcmp(portage.pkgsplit(x[2]), portage.pkgsplit(myoldbest)) < 0:
+							addl+=turquoise("U")+blue("D")
 						else:
-							addl+=turquoise("U")+blue("-")
+							addl+=turquoise("U")+" "
+					else:
+						myoldbest=portage.best(myoldlist)
+						addl="   "+fetch+turquoise("U")+blue("S")
 
 					if "--changelog" in myopts:
 		 				changelogs.extend(self.calc_changelog(