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 (-10 / +12 lines)
Lines 774-780 Link Here
774
			print "Depstring:",depstring
774
			print "Depstring:",depstring
775
		if not arg:
775
		if not arg:
776
			#processing dependencies
776
			#processing dependencies
777
			mycheck=portage.dep_check(depstring,self.mydbapi[myroot])
777
			mycheck=portage.dep_check(depstring,self.mydbapi[myroot],parent=myparent)
778
			if not mycheck[0]:
778
			if not mycheck[0]:
779
				return 0
779
				return 0
780
			mymerge=mycheck[1]
780
			mymerge=mycheck[1]
Lines 1059-1072 Link Here
1059
1059
1060
				iuse=""
1060
				iuse=""
1061
				if "--verbose" in myopts:
1061
				if "--verbose" in myopts:
1062
					myiuse=portage.dep_getpuse(x[2])
1062
					for ebuild_iuse in string.split(portage.portdb.aux_get(x[2],["IUSE"])[0], " "):
1063
					for ebuild_iuse in string.split(portage.portdb.aux_get(x[2],["IUSE"])[0], " "):
1063
						try:
1064
						if ebuild_iuse in myiuse:
1064
							if (portage.usesplit.index(ebuild_iuse) >= 0) :
1065
							iuse=iuse+darkred("+"+ebuild_iuse)+" "
1065
								iuse=iuse+red("+"+ebuild_iuse)+" "
1066
						elif "-"+ebuild_iuse in myiuse:
1066
						except ValueError:
1067
							iuse=iuse+darkblue("-"+ebuild_iuse)+" "
1067
							if ebuild_iuse != "":
1068
						elif ebuild_iuse in portage.usesplit:
1068
								iuse=iuse+blue("-"+ebuild_iuse)+" "
1069
							iuse=iuse+red("+"+ebuild_iuse)+" "
1069
1070
						elif ebuild_iuse != "":
1071
							iuse=iuse+blue("-"+ebuild_iuse)+" "
1070
				xs=portage.pkgsplit(x[2])
1072
				xs=portage.pkgsplit(x[2])
1071
				if xs[2]=="r0":
1073
				if xs[2]=="r0":
1072
					xs[2]=""
1074
					xs[2]=""
Lines 1810-1817 Link Here
1810
	else:
1812
	else:
1811
		myvars=['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
1813
		myvars=['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
1812
				'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY',
1814
				'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY',
1813
				'USE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS','ACCEPT_KEYWORDS', 
1815
				'USE', 'PKGUSE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS',
1814
				'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']
1816
				'ACCEPT_KEYWORDS', 'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']
1815
	for x in myvars:
1817
	for x in myvars:
1816
		print x+'="'+portage.settings[x]+'"'
1818
		print x+'="'+portage.settings[x]+'"'
1817
	#print portage.settings.keys()
1819
	#print portage.settings.keys()

Return to bug 13616