Gentoo Archives: gentoo-commits

From: Magnus Granberg <zorry@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/steps/
Date: Mon, 24 Jan 2022 08:41:53
Message-Id: 1643013694.d3fb5e15c10d25fa06c6862fbbcd996a2d6182df.zorry@gentoo
1 commit: d3fb5e15c10d25fa06c6862fbbcd996a2d6182df
2 Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 24 08:41:34 2022 +0000
4 Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 24 08:41:34 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=d3fb5e15
7
8 set ACCEPT_LICENSE by project
9
10 Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>
11
12 buildbot_gentoo_ci/steps/portage.py | 5 +++--
13 1 file changed, 3 insertions(+), 2 deletions(-)
14
15 diff --git a/buildbot_gentoo_ci/steps/portage.py b/buildbot_gentoo_ci/steps/portage.py
16 index 08ab559..e5d0a25 100644
17 --- a/buildbot_gentoo_ci/steps/portage.py
18 +++ b/buildbot_gentoo_ci/steps/portage.py
19 @@ -224,8 +224,9 @@ class SetMakeConf(BuildStep):
20 for v in makeconf_variables_values_data:
21 if v['build_id'] == 0:
22 makeconf_variable_list.append(v['value'])
23 - if k['variable'] == 'ACCEPT_LICENSE' and makeconf_variable_list != []:
24 - makeconf_variable_list.append('ACCEPT_LICENSE="*"')
25 + #NOTE: set it by project
26 + #if k['variable'] == 'ACCEPT_LICENSE' and makeconf_variable_list != []:
27 + # makeconf_variable_list.append('ACCEPT_LICENSE="*"')
28 if makeconf_variable_list != []:
29 makeconf_variable_string = k['variable'] + '="' + separator2.join(makeconf_variable_list) + '"'
30 makeconf_list.append(makeconf_variable_string)