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

Collapse All | Expand All

(-)emerge.orig (-11 / +13 lines)
Lines 740-746 Link Here
740
			print "Depstring:",depstring
740
			print "Depstring:",depstring
741
		if not arg:
741
		if not arg:
742
			#processing dependencies
742
			#processing dependencies
743
			mycheck=portage.dep_check(depstring,self.mydbapi[myroot])
743
			mycheck=portage.dep_check(depstring,self.mydbapi[myroot],parent=myparent)
744
			if not mycheck[0]:
744
			if not mycheck[0]:
745
				return 0
745
				return 0
746
			mymerge=mycheck[1]
746
			mymerge=mycheck[1]
Lines 1000-1015 Link Here
1000
					myoldbest=blue("["+myoldbest+"]")
1000
					myoldbest=blue("["+myoldbest+"]")
1001
1001
1002
				iuse=""
1002
				iuse=""
1003
				xs=portage.pkgsplit(x[2])
1003
				if "--verbose" in myopts:
1004
				if "--verbose" in myopts:
1004
					for ebuild_iuse in string.split(portage.portdb.aux_get(x[2],["IUSE"])[0], " "):
1005
					for ebuild_iuse in string.split(portage.portdb.aux_get(x[2],["IUSE"])[0], " "):
1005
						try:
1006
						if (portage.pkgusesplit.has_key(xs[0]) and (ebuild_iuse in portage.pkgusesplit[xs[0]] or "-"+ebuild_iuse in portage.pkgusesplit[xs[0]])):
1006
							if (portage.usesplit.index(ebuild_iuse) >= 0) :
1007
							if ebuild_iuse in portage.pkgusesplit[xs[0]]:
1007
								iuse=iuse+red("+"+ebuild_iuse)+" "
1008
								iuse=iuse+darkblue("+"+ebuild_iuse)+" "
1008
						except ValueError:
1009
							elif "-"+ebuild_iuse in portage.pkgusesplit[xs[0]]:
1009
							if ebuild_iuse != "":
1010
								iuse=iuse+darkred("-"+ebuild_iuse)+" "
1010
								iuse=iuse+blue("-"+ebuild_iuse)+" "
1011
						elif (ebuild_iuse in portage.usesplit):
1011
1012
							iuse=iuse+red("+"+ebuild_iuse)+" "
1012
				xs=portage.pkgsplit(x[2])
1013
						elif (ebuild_iuse != ""):
1014
							iuse=iuse+blue("-"+ebuild_iuse)+" "
1013
				if xs[2]=="r0":
1015
				if xs[2]=="r0":
1014
					xs[2]=""
1016
					xs[2]=""
1015
				else:
1017
				else:
Lines 1752-1759 Link Here
1752
	else:
1754
	else:
1753
		myvars=['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
1755
		myvars=['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
1754
				'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY',
1756
				'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY',
1755
				'USE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS','ACCEPT_KEYWORDS', 
1757
				'USE', 'PKGUSE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS',
1756
				'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']
1758
				'ACCEPT_KEYWORDS', 'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']
1757
	for x in myvars:
1759
	for x in myvars:
1758
		print x+'="'+portage.settings[x]+'"'
1760
		print x+'="'+portage.settings[x]+'"'
1759
	#print portage.settings.keys()
1761
	#print portage.settings.keys()

Return to bug 13616