Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 565028 Details for
Bug 677800
Migrate the ACCEPT_LICENSE default from portage to the base profile
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated Arfrever's patch
0001-ResolverPlayground-Set-ACCEPT_LICENSE-for-test-suite.patch (text/plain), 2.21 KB, created by
Ulrich Müller
on 2019-02-13 06:28:56 UTC
(
hide
)
Description:
Updated Arfrever's patch
Filename:
MIME Type:
Creator:
Ulrich Müller
Created:
2019-02-13 06:28:56 UTC
Size:
2.21 KB
patch
obsolete
>From 7e26c06e0fe10c32a8dce28c8ffad9993fcbfc49 Mon Sep 17 00:00:00 2001 >From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >Date: Wed, 13 Feb 2019 02:31:04 +0100 >Subject: [PATCH] ResolverPlayground: Set ACCEPT_LICENSE for test suite here >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Set the value needed for the test suite directly in the test suite. >Change the fallback in the config class to "@FREE" so that it will >agree with the new default. > >Bug: https://bugs.gentoo.org/677800 >Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >Signed-off-by: Ulrich Müller <ulm@gentoo.org> >--- > lib/portage/package/ebuild/config.py | 2 +- > lib/portage/tests/resolver/ResolverPlayground.py | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > >diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py >index 2981f7e31..340f908f3 100644 >--- a/lib/portage/package/ebuild/config.py >+++ b/lib/portage/package/ebuild/config.py >@@ -2278,7 +2278,7 @@ class config(object): > for curdb in mydbs: > mysplit.extend(curdb.get('ACCEPT_LICENSE', '').split()) > mysplit = prune_incremental(mysplit) >- accept_license_str = ' '.join(mysplit) or '* -@EULA' >+ accept_license_str = ' '.join(mysplit) or '@FREE' > self.configlist[-1]['ACCEPT_LICENSE'] = accept_license_str > self._license_manager.set_accept_license_str(accept_license_str) > else: >diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py >index fc754fb42..77c7c1b52 100644 >--- a/lib/portage/tests/resolver/ResolverPlayground.py >+++ b/lib/portage/tests/resolver/ResolverPlayground.py >@@ -1,4 +1,4 @@ >-# Copyright 2010-2015 Gentoo Foundation >+# Copyright 2010-2019 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > > from itertools import permutations >@@ -412,6 +412,7 @@ class ResolverPlayground(object): > with open(make_defaults_file, "w") as f: > f.write("ARCH=\"x86\"\n") > f.write("ACCEPT_KEYWORDS=\"x86\"\n") >+ f.write("ACCEPT_LICENSE=\"* -@EULA\"\n") > > use_force_file = os.path.join(sub_profile_dir, "use.force") > with open(use_force_file, "w") as f: >-- >2.19.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 677800
:
564928
|
565022
|
565026
|
565028