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 (-9 / +11 lines)
Lines 732-738 Link Here
732
			print "Depstring:",depstring
732
			print "Depstring:",depstring
733
		if not arg:
733
		if not arg:
734
			#processing dependencies
734
			#processing dependencies
735
			mycheck=portage.dep_check(depstring,self.mydbapi[myroot])
735
			mycheck=portage.dep_check(depstring,self.mydbapi[myroot],parent=myparent)
736
			if not mycheck[0]:
736
			if not mycheck[0]:
737
				return 0
737
				return 0
738
			mymerge=mycheck[1]
738
			mymerge=mycheck[1]
Lines 980-995 Link Here
980
					myoldbest=blue("["+myoldbest+"]")
980
					myoldbest=blue("["+myoldbest+"]")
981
981
982
				iuse=""
982
				iuse=""
983
				xs=portage.pkgsplit(x[2])
983
				if "--verbose" in myopts:
984
				if "--verbose" in myopts:
984
					for ebuild_iuse in string.split(portage.portdb.aux_get(x[2],["IUSE"])[0], " "):
985
					for ebuild_iuse in string.split(portage.portdb.aux_get(x[2],["IUSE"])[0], " "):
985
						try:
986
						if (portage.pkgusesplit.has_key(xs[0])):
986
							if (portage.usesplit.index(ebuild_iuse) >= 0) :
987
							if (ebuild_iuse in portage.pkgusesplit[xs[0]] or ("-"+ebuild_iuse not in portage.pkgusesplit[xs[0]] and ebuild_iuse in portage.usesplit)):
987
								iuse=iuse+red("+"+ebuild_iuse)+" "
988
								iuse=iuse+red("+"+ebuild_iuse)+" "
988
						except ValueError:
989
							else:
989
							if ebuild_iuse != "":
990
								iuse=iuse+blue("-"+ebuild_iuse)+" "
990
								iuse=iuse+blue("-"+ebuild_iuse)+" "
991
991
						elif (ebuild_iuse in portage.usesplit):
992
				xs=portage.pkgsplit(x[2])
992
							iuse=iuse+red("+"+ebuild_iuse)+" "
993
						elif (ebuild_iuse != ""):
994
							iuse=iuse+blue("-"+ebuild_iuse)+" "
993
				if xs[2]=="r0":
995
				if xs[2]=="r0":
994
					xs[2]=""
996
					xs[2]=""
995
				else:
997
				else:
Lines 1728-1735 Link Here
1728
	else:
1730
	else:
1729
		myvars=['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
1731
		myvars=['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
1730
				'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY',
1732
				'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY',
1731
				'USE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS','ACCEPT_KEYWORDS', 
1733
				'USE', 'PKGUSE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS',
1732
				'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']
1734
				'ACCEPT_KEYWORDS', 'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']
1733
	for x in myvars:
1735
	for x in myvars:
1734
		print x+'="'+portage.settings[x]+'"'
1736
		print x+'="'+portage.settings[x]+'"'
1735
	#print portage.settings.keys()
1737
	#print portage.settings.keys()

Return to bug 13616