Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 18608
Collapse All | Expand All

(-)bin/emerge.orig (-14 / +11 lines)
Lines 1031-1052 Link Here
1031
				if (not "--emptytree" in myopts) and portage.db[x[1]]["vartree"].exists_specific(x[2]):
1031
				if (not "--emptytree" in myopts) and portage.db[x[1]]["vartree"].exists_specific(x[2]):
1032
					addl="  "+yellow("R")+fetch+"  "
1032
					addl="  "+yellow("R")+fetch+"  "
1033
				elif (not "--emptytree" in myopts) and portage.db[x[1]]["vartree"].exists_specific_cat(x[2]):
1033
				elif (not "--emptytree" in myopts) and portage.db[x[1]]["vartree"].exists_specific_cat(x[2]):
1034
					myoldbest=portage.best(portage.db[x[1]]["vartree"].dbapi.match(portage.pkgsplit(x[2])[0]))
1035
1036
					try:
1037
						myoldslot=portage.db[portage.root]["vartree"].getslot(myoldbest)
1038
					except:
1039
						myoldslot=None
1040
					mynewslot=portage.portdb.aux_get(x[2],["SLOT"])[0]
1034
					mynewslot=portage.portdb.aux_get(x[2],["SLOT"])[0]
1041
1035
					myoldlist=portage.db[x[1]]["vartree"].dbapi.match(portage.pkgsplit(x[2])[0])
1042
					addl="   "+fetch
1036
					myinslotlist=filter((lambda p: portage.db[portage.root]["vartree"].getslot(p)==mynewslot),myoldlist)
1043
					if (myoldslot==mynewslot) and portage.pkgcmp(portage.pkgsplit(x[2]), portage.pkgsplit(myoldbest)) < 0:
1037
					if myinslotlist:
1044
						addl+=turquoise("U")+blue("D")
1038
						myoldbest=portage.best(myinslotlist)
1045
					else:
1039
						addl="   "+fetch
1046
						if myoldslot:
1040
						if portage.pkgcmp(portage.pkgsplit(x[2]), portage.pkgsplit(myoldbest)) < 0:
1047
							addl+=turquoise("U")+" "
1041
							addl+=turquoise("U")+blue("D")
1048
						else:
1042
						else:
1049
							addl+=turquoise("U")+blue("-")
1043
							addl+=turquoise("U")+" "
1044
					else:
1045
						myoldbest=portage.best(myoldlist)
1046
						addl="   "+fetch+turquoise("U")+blue("S")
1050
1047
1051
					if "--changelog" in myopts:
1048
					if "--changelog" in myopts:
1052
		 				changelogs.extend(self.calc_changelog(
1049
		 				changelogs.extend(self.calc_changelog(

Return to bug 18608