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.old (-2 / +16 lines)
Lines 1509-1523 Link Here
1509
					# overlay verbose
1509
					# overlay verbose
1510
					# XXX: Invalid binaries have caused tracebacks here. 'if file_name'
1510
					# XXX: Invalid binaries have caused tracebacks here. 'if file_name'
1511
					# x = ['binary', '/', 'sys-apps/pcmcia-cs-3.2.7.2.6', 'merge']
1511
					# x = ['binary', '/', 'sys-apps/pcmcia-cs-3.2.7.2.6', 'merge']
1512
					file_name=portage.portdb.findname(x[2])
1512
					file_name,dir_name=portage.portdb.findname2(x[2])
1513
					is_overlay = False
1513
					if file_name: # It might not exist in the tree
1514
					if file_name: # It might not exist in the tree
1514
						dir_name=os.path.abspath(os.path.dirname(file_name)+"/../..")
1515
						if (overlays.count(dir_name)>0):
1515
						if (overlays.count(dir_name)>0):
1516
							verboseadd+=teal("["+str(overlays.index(os.path.normpath(dir_name))+1)+"]")+" "
1516
							verboseadd+=teal("["+str(overlays.index(os.path.normpath(dir_name))+1)+"]")+" "
1517
							display_overlays=True
1517
							display_overlays=True
1518
							is_overlay = True
1518
					else:
1519
					else:
1519
						verboseadd += "[No ebuild?]"
1520
						verboseadd += "[No ebuild?]"
1520
1521
1522
					mypkg = portage.catpkgsplit(x[2])
1523
					mypkg = mypkg[0]+"/"+mypkg[1]
1524
					if is_overlay == False :
1525
						in_overlay = 0
1526
						for my_x in portage.portdb.xmatch("match-all", mypkg):
1527
							if my_x != x[2]:
1528
								my_file_name = portage.portdb.findname(my_x)
1529
								my_dir_name  = os.path.abspath(os.path.dirname(my_file_name)+"/../..")
1530
								if (overlays.count(my_dir_name) > 0) :
1531
									in_overlay += 1
1532
						if in_overlay > 0 :
1533
							verboseadd += yellow("[o"+str(in_overlay) +"]") + " "
1534
1521
				xs=portage.pkgsplit(x[2])
1535
				xs=portage.pkgsplit(x[2])
1522
				if xs[2]=="r0":
1536
				if xs[2]=="r0":
1523
					xs[2]=""
1537
					xs[2]=""

Return to bug 67072