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 / +16 lines)
Lines 1701-1716 Link Here
1701
					# overlay verbose
1701
					# overlay verbose
1702
					# XXX: Invalid binaries have caused tracebacks here. 'if file_name'
1702
					# XXX: Invalid binaries have caused tracebacks here. 'if file_name'
1703
					# x = ['binary', '/', 'sys-apps/pcmcia-cs-3.2.7.2.6', 'merge']
1703
					# x = ['binary', '/', 'sys-apps/pcmcia-cs-3.2.7.2.6', 'merge']
1704
					file_name=portage.portdb.findname(x[2])
1704
					file_name,dir_name=portage.portdb.findname2(x[2])
1705
					is_overlay = False
1705
					if file_name: # It might not exist in the tree
1706
					if file_name: # It might not exist in the tree
1706
						dir_name=os.path.abspath(os.path.dirname(file_name)+"/../..")
1707
						if (overlays_real.count(dir_name)>0):
1707
						if (overlays_real.count(dir_name)>0):
1708
							verboseadd+=teal("["+str(overlays_real.index(
1708
							verboseadd+=teal("["+str(overlays_real.index(
1709
								os.path.normpath(dir_name))+1)+"]")+" "
1709
								os.path.normpath(dir_name))+1)+"]")+" "
1710
							display_overlays=True
1710
							display_overlays=True
1711
							is_overlay = True
1711
					else:
1712
					else:
1712
						verboseadd += "[No ebuild?]"
1713
						verboseadd += "[No ebuild?]"
1713
1714
1715
					mypkg = portage.catpkgsplit(x[2])
1716
					mypkg = mypkg[0]+"/"+mypkg[1]
1717
					if is_overlay == False :
1718
						in_overlay = 0
1719
						for my_x in portage.portdb.xmatch("match-all", mypkg):
1720
							if my_x != x[2]:
1721
								my_file_name = portage.portdb.findname(my_x)
1722
								my_dir_name  = os.path.abspath(os.path.dirname(my_file_name)+"/../..")
1723
								if (overlays.count(my_dir_name) > 0) :
1724
									in_overlay += 1
1725
						if in_overlay > 0 :
1726
							verboseadd += yellow("[o"+str(in_overlay) +"]") + " "
1727
1714
				xs=portage.pkgsplit(x[2])
1728
				xs=portage.pkgsplit(x[2])
1715
				if xs[2]=="r0":
1729
				if xs[2]=="r0":
1716
					xs[2]=""
1730
					xs[2]=""

Return to bug 67072