Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 67072 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/lib/portage/bin/emerge.orig (-2 / +15 lines)
Lines 1602-1616 Link Here
1602
					# overlay verbose
1602
					# overlay verbose
1603
					# XXX: Invalid binaries have caused tracebacks here. 'if file_name'
1603
					# XXX: Invalid binaries have caused tracebacks here. 'if file_name'
1604
					# x = ['binary', '/', 'sys-apps/pcmcia-cs-3.2.7.2.6', 'merge']
1604
					# x = ['binary', '/', 'sys-apps/pcmcia-cs-3.2.7.2.6', 'merge']
1605
					file_name = portdb.findname(pkg_key)
1605
					file_name,dir_name = portdb.findname2(pkg_key)
1606
					is_overlay = False
1606
					if file_name: # It might not exist in the tree
1607
					if file_name: # It might not exist in the tree
1607
						dir_name=os.path.abspath(os.path.dirname(file_name)+"/../..")
1608
						if (overlays_real.count(dir_name)>0):
1608
						if (overlays_real.count(dir_name)>0):
1609
							verboseadd+=teal("["+str(overlays_real.index(
1609
							verboseadd+=teal("["+str(overlays_real.index(
1610
								os.path.normpath(dir_name))+1)+"]")+" "
1610
								os.path.normpath(dir_name))+1)+"]")+" "
1611
							display_overlays=True
1611
							display_overlays=True
1612
							is_overlay = True
1612
					else:
1613
					else:
1613
						verboseadd += "[No ebuild?]"
1614
						verboseadd += "[No ebuild?]"
1615
 					mypkg = portage.catpkgsplit(pkg_key)
1616
 					mypkg = mypkg[0]+"/"+mypkg[1]
1617
 					if is_overlay == False :
1618
 						in_overlay = 0
1619
 						for my_x in portdb.xmatch("match-all", mypkg):
1620
 							if my_x != pkg_key:
1621
 								my_file_name = portdb.findname(my_x)
1622
 								my_dir_name  = os.path.abspath(os.path.dirname(my_file_name)+"/../..")
1623
 								if (overlays.count(my_dir_name) > 0) :
1624
 									in_overlay += 1
1625
 						if in_overlay > 0 :
1626
 							verboseadd += yellow("[o"+str(in_overlay) +"]") + " "
1614
1627
1615
				xs=portage.pkgsplit(x[2])
1628
				xs=portage.pkgsplit(x[2])
1616
				if xs[2]=="r0":
1629
				if xs[2]=="r0":

Return to bug 67072