1 |
Author: zmedico |
2 |
Date: 2009-04-30 22:47:50 +0000 (Thu, 30 Apr 2009) |
3 |
New Revision: 13577 |
4 |
|
5 |
Modified: |
6 |
main/branches/2.1.6/pym/portage/__init__.py |
7 |
Log: |
8 |
Disable ACCEPT_LICENSE license group expansion and related code since license |
9 |
masking isn't supported in the 2.1.6 branch and we don't want it to interfere |
10 |
with check_license() behavior. |
11 |
|
12 |
|
13 |
Modified: main/branches/2.1.6/pym/portage/__init__.py |
14 |
=================================================================== |
15 |
--- main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 22:00:48 UTC (rev 13576) |
16 |
+++ main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 22:47:50 UTC (rev 13577) |
17 |
@@ -1820,7 +1820,8 @@ |
18 |
# Expand license groups |
19 |
# This has to do be done for each config layer before regenerate() |
20 |
# in order for incremental negation to work properly. |
21 |
- if local_config: |
22 |
+ #if local_config: |
23 |
+ if False: |
24 |
for c in self.configdict.itervalues(): |
25 |
v = c.get("ACCEPT_LICENSE") |
26 |
if not v: |
27 |
@@ -2083,7 +2084,7 @@ |
28 |
use = self.built_use |
29 |
if use is None: |
30 |
use = frozenset(settings['PORTAGE_USE'].split()) |
31 |
- values['ACCEPT_LICENSE'] = self._accept_license(use, settings) |
32 |
+ #values['ACCEPT_LICENSE'] = self._accept_license(use, settings) |
33 |
values['PORTAGE_RESTRICT'] = self._restrict(use, settings) |
34 |
return values |
35 |
|
36 |
@@ -2339,8 +2340,8 @@ |
37 |
env_configdict.pop(k, None) |
38 |
|
39 |
lazy_vars = self._lazy_vars(built_use, self) |
40 |
- env_configdict.addLazySingleton('ACCEPT_LICENSE', |
41 |
- lazy_vars.__getitem__, 'ACCEPT_LICENSE') |
42 |
+ #env_configdict.addLazySingleton('ACCEPT_LICENSE', |
43 |
+ # lazy_vars.__getitem__, 'ACCEPT_LICENSE') |
44 |
env_configdict.addLazySingleton('PORTAGE_RESTRICT', |
45 |
lazy_vars.__getitem__, 'PORTAGE_RESTRICT') |