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

Collapse All | Expand All

(-)a/lib/portage/package/ebuild/config.py (-1 / +1 lines)
Lines 2278-2284 class config(object): Link Here
2278
			for curdb in mydbs:
2278
			for curdb in mydbs:
2279
				mysplit.extend(curdb.get('ACCEPT_LICENSE', '').split())
2279
				mysplit.extend(curdb.get('ACCEPT_LICENSE', '').split())
2280
			mysplit = prune_incremental(mysplit)
2280
			mysplit = prune_incremental(mysplit)
2281
			accept_license_str = ' '.join(mysplit) or '* -@EULA'
2281
			accept_license_str = ' '.join(mysplit)
2282
			self.configlist[-1]['ACCEPT_LICENSE'] = accept_license_str
2282
			self.configlist[-1]['ACCEPT_LICENSE'] = accept_license_str
2283
			self._license_manager.set_accept_license_str(accept_license_str)
2283
			self._license_manager.set_accept_license_str(accept_license_str)
2284
		else:
2284
		else:
(-)a/lib/portage/tests/resolver/ResolverPlayground.py (-2 / +2 lines)
Lines 1-4 Link Here
1
# Copyright 2010-2015 Gentoo Foundation
1
# Copyright 2010-2019 Gentoo Authors
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
3
4
from itertools import permutations
4
from itertools import permutations
Lines 412-417 class ResolverPlayground(object): Link Here
412
				with open(make_defaults_file, "w") as f:
412
				with open(make_defaults_file, "w") as f:
413
					f.write("ARCH=\"x86\"\n")
413
					f.write("ARCH=\"x86\"\n")
414
					f.write("ACCEPT_KEYWORDS=\"x86\"\n")
414
					f.write("ACCEPT_KEYWORDS=\"x86\"\n")
415
					f.write("ACCEPT_LICENSE=\"* -@EULA\"\n")
415
416
416
				use_force_file = os.path.join(sub_profile_dir, "use.force")
417
				use_force_file = os.path.join(sub_profile_dir, "use.force")
417
				with open(use_force_file, "w") as f:
418
				with open(use_force_file, "w") as f:
418
- 

Return to bug 677800