[patch] portage-2.1.3_rc5 patch to make colors customizable via color.map

colors.patch (text/plain), 4.39 KB, created by Zac Medico on 2007-06-25 10:54:02 UTC

Index: pym/output.py
===================================================================
--- pym/output.py	(revision 6979)
+++ pym/output.py	(revision 7032)
@@ -129,6 +129,10 @@
 codes["UNMERGE_WARN"] = codes["red"]
 codes["SECURITY_WARN"] = codes["red"]
 codes["MERGE_LIST_PROGRESS"] = codes["yellow"]
+codes["PKG_MERGE"]           = codes["darkgreen"]
+codes["PKG_MERGE_WORLD"]     = codes["green"]
+codes["PKG_NOMERGE"]         = codes["darkblue"]
+codes["PKG_NOMERGE_WORLD"]   = codes["blue"]
 
 def parse_color_map():
 	myfile = COLOR_MAP_FILE
Index: bin/emerge
===================================================================
--- bin/emerge	(revision 6979)
+++ bin/emerge	(revision 7032)
@@ -2444,6 +2447,8 @@
 		# files to fetch list - avoids counting a same file twice
 		# in size display (verbose mode)
 		myfetchlist=[]
+		worldlist = set(getlist(self.settings, "world"))
+
 		for mylist_index in xrange(len(mylist)):
 			x, depth, ordered = mylist[mylist_index]
 			pkg_type = x[0]
@@ -2479,6 +2484,7 @@
 			else:
 				mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi
 				pkg_status = x[3]
+				pkg_merge = ordered and pkg_status != "nomerge"
 				binary_package = True
 				if "ebuild" == pkg_type:
 					if "merge" == x[3] or \
@@ -2652,7 +2658,7 @@
 				if verbosity == 3:
 					# size verbose
 					mysize=0
-					if x[0] == "ebuild" and ordered and x[-1] != "nomerge":
+					if pkg_type == "ebuild" and pkg_merge:
 						try:
 							myfilesdict = portdb.getfetchsizes(pkg_key,
 								useflags=self.useFlags[myroot][pkg_key],
@@ -2712,17 +2718,32 @@
 						myoldbest=myoldbest[:-3]
 					myoldbest=blue("["+myoldbest+"]")
 
+				pkg_cp = xs[0]
+				pkg_world = pkg_cp in worldlist
+
+				def pkgprint(pkg):
+					if pkg_merge:
+						if pkg_world:
+							return colorize("PKG_MERGE_WORLD", pkg)
+						else:
+							return colorize("PKG_MERGE", pkg)
+					else:
+						if pkg_world:
+							return colorize("PKG_NOMERGE_WORLD", pkg)
+						else:
+							return colorize("PKG_NOMERGE", pkg)
+
 				if x[1]!="/":
 					if myoldbest:
 						myoldbest +=" "
 					if "--columns" in self.myopts:
 						if "--quiet" in self.myopts:
-							myprint=addl+" "+indent+darkgreen(xs[0])
+							myprint=addl+" "+indent+pkgprint(pkg_cp)
 							myprint=myprint+darkblue(" "+xs[1]+xs[2])+" "
 							myprint=myprint+myoldbest
 							myprint=myprint+darkgreen("to "+x[1])
 						else:
-							myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0])
+							myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_cp)
 							if (newlp-nc_len(myprint)) > 0:
 								myprint=myprint+(" "*(newlp-nc_len(myprint)))
 							myprint=myprint+"["+darkblue(xs[1]+xs[2])+"] "
@@ -2731,21 +2752,21 @@
 							myprint=myprint+myoldbest
 							myprint=myprint+darkgreen("to "+x[1])+" "+verboseadd
 					else:
-						if x[-1] == "nomerge" or not ordered:
-							myprint = darkblue("[nomerge      ] ")
+						if not pkg_merge:
+							myprint = "[%s      ] " % pkgprint("nomerge")
 						else:
 							myprint = "[" + pkg_type + " " + addl + "] "
-						myprint += indent + darkgreen(pkg_key) + " " + \
+						myprint += indent + pkgprint(pkg_key) + " " + \
 							myoldbest + darkgreen("to " + myroot) + " " + \
 							verboseadd
 				else:
 					if "--columns" in self.myopts:
 						if "--quiet" in self.myopts:
-							myprint=addl+" "+indent+darkgreen(xs[0])
+							myprint=addl+" "+indent+pkgprint(pkg_cp)
 							myprint=myprint+" "+green(xs[1]+xs[2])+" "
 							myprint=myprint+myoldbest
 						else:
-							myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0])
+							myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_cp)
 							if (newlp-nc_len(myprint)) > 0:
 								myprint=myprint+(" "*(newlp-nc_len(myprint)))
 							myprint=myprint+green(" ["+xs[1]+xs[2]+"] ")
@@ -2753,10 +2774,10 @@
 								myprint=myprint+(" "*(oldlp-nc_len(myprint)))
 							myprint=myprint+myoldbest+"  "+verboseadd
 					else:
-						if x[-1] == "nomerge" or not ordered:
-							myprint=darkblue("[nomerge      ] "+indent+x[2]+" "+myoldbest+" ")+verboseadd
+						if not pkg_merge:
+							myprint="["+pkgprint("nomerge")+"      ] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd
 						else:
-							myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(x[2])+" "+myoldbest+" "+verboseadd
+							myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd
 				p.append(myprint)
 
 			mysplit = portage.pkgsplit(x[2])