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

Collapse All | Expand All

(-)emerge.orig (-1 / +23 lines)
Lines 1911-1917 Link Here
1911
		myvars=['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
1911
		myvars=['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
1912
				'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY',
1912
				'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY',
1913
				'USE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS','ACCEPT_KEYWORDS', 
1913
				'USE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS','ACCEPT_KEYWORDS', 
1914
				'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']
1914
				'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES', 'ACCEPT_LICENSES']
1915
	myvars.sort()
1915
	myvars.sort()
1916
	for x in myvars:
1916
	for x in myvars:
1917
		print x+'="'+portage.settings[x]+'"'
1917
		print x+'="'+portage.settings[x]+'"'
Lines 2120-2125 Link Here
2120
			if ("--usepkgonly" in myopts) and mydepgraph.missingbins:
2120
			if ("--usepkgonly" in myopts) and mydepgraph.missingbins:
2121
				sys.stderr.write(red("The following binaries are not available for merging...\n"))
2121
				sys.stderr.write(red("The following binaries are not available for merging...\n"))
2122
2122
2123
		accept_licenses = string.split(portage.settings['ACCEPT_LICENSES'])
2124
		print accept_licenses 
2125
		all_licenses_accepted = 1
2126
		for pkg in mydepgraph.altlist():
2127
			pkg_licenses = portage.portdb.aux_get(pkg[2], ["LICENSE"])[0]
2128
			for license_group in string.split(pkg_licenses,"|"):
2129
				license_accepted = 1
2130
				for license in string.split(license_group):
2131
					try:
2132
						temp = accept_licenses.index(license)
2133
					except Exception,e:
2134
						license_accepted = 0
2135
				if license_accepted == 1:
2136
					break
2137
			if license_accepted == 0:
2138
				print "\n!!! License(s) " + string.replace(pkg_licenses, "|", "or") + " required by " + pkg[2]
2139
				print "!!! has not been accepted. Please review and add to ACCEPT_LICENSES."
2140
				all_licenses_accepted = 0
2141
		if all_licenses_accepted == 0:
2142
			print
2143
			sys.exit(1)
2144
			
2123
		if mydepgraph.missingbins:
2145
		if mydepgraph.missingbins:
2124
			for x in mydepgraph.missingbins:
2146
			for x in mydepgraph.missingbins:
2125
				sys.stderr.write("   "+str(x)+"\n")
2147
				sys.stderr.write("   "+str(x)+"\n")

Return to bug 17367