1 |
commit: 3507aa783cdf93fd28a58fb32df2fe7e03c46330 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 28 00:24:54 2013 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 28 00:24:54 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3507aa78 |
7 |
|
8 |
_display_use: use local variables |
9 |
|
10 |
--- |
11 |
pym/_emerge/resolver/output.py | 35 +++++++++++++++-------------------- |
12 |
1 files changed, 15 insertions(+), 20 deletions(-) |
13 |
|
14 |
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py |
15 |
index 1ebb248..9e383e2 100644 |
16 |
--- a/pym/_emerge/resolver/output.py |
17 |
+++ b/pym/_emerge/resolver/output.py |
18 |
@@ -58,11 +58,6 @@ class Display(object): |
19 |
self.oldlp = None |
20 |
self.myfetchlist = None |
21 |
self.indent = '' |
22 |
- self.is_new = True |
23 |
- self.cur_use = None |
24 |
- self.cur_iuse = None |
25 |
- self.old_use = '' |
26 |
- self.old_iuse = '' |
27 |
self.use_expand = None |
28 |
self.use_expand_hidden = None |
29 |
self.pkgsettings = None |
30 |
@@ -185,28 +180,28 @@ class Display(object): |
31 |
@param pkg: _emerge.Package.Package instance |
32 |
@param pkg_info: PkgInfo instance |
33 |
Modifies self.use_expand_hidden, self.use_expand, self.verboseadd, |
34 |
- self.forced_flags, self.cur_iuse, self.old_iuse, self.old_use |
35 |
+ self.forced_flags |
36 |
""" |
37 |
|
38 |
self.forced_flags = set() |
39 |
self.forced_flags.update(pkg.use.force) |
40 |
self.forced_flags.update(pkg.use.mask) |
41 |
|
42 |
- self.cur_use = [flag for flag in self.conf.pkg_use_enabled(pkg) \ |
43 |
+ cur_use = [flag for flag in self.conf.pkg_use_enabled(pkg) \ |
44 |
if flag in pkg.iuse.all] |
45 |
- self.cur_iuse = sorted(pkg.iuse.all) |
46 |
+ cur_iuse = sorted(pkg.iuse.all) |
47 |
|
48 |
if pkg_info.previous_pkg is not None: |
49 |
previous_pkg = pkg_info.previous_pkg |
50 |
- self.old_iuse = sorted(previous_pkg.iuse.all) |
51 |
- self.old_use = previous_pkg.use.enabled |
52 |
- self.is_new = False |
53 |
+ old_iuse = sorted(previous_pkg.iuse.all) |
54 |
+ old_use = previous_pkg.use.enabled |
55 |
+ is_new = False |
56 |
else: |
57 |
- self.old_iuse = [] |
58 |
- self.old_use = [] |
59 |
- self.is_new = True |
60 |
+ old_iuse = [] |
61 |
+ old_use = [] |
62 |
+ is_new = True |
63 |
|
64 |
- self.old_use = [flag for flag in self.old_use if flag in self.old_iuse] |
65 |
+ old_use = [flag for flag in old_use if flag in old_iuse] |
66 |
|
67 |
self.use_expand = pkg.use.expand |
68 |
self.use_expand_hidden = pkg.use.expand_hidden |
69 |
@@ -233,10 +228,10 @@ class Display(object): |
70 |
reinst_expand_map) |
71 |
|
72 |
cur_iuse_map, iuse_forced = \ |
73 |
- self.map_to_use_expand(self.cur_iuse, forced_flags=True) |
74 |
- cur_use_map = self.map_to_use_expand(self.cur_use) |
75 |
- old_iuse_map = self.map_to_use_expand(self.old_iuse) |
76 |
- old_use_map = self.map_to_use_expand(self.old_use) |
77 |
+ self.map_to_use_expand(cur_iuse, forced_flags=True) |
78 |
+ cur_use_map = self.map_to_use_expand(cur_use) |
79 |
+ old_iuse_map = self.map_to_use_expand(old_iuse) |
80 |
+ old_use_map = self.map_to_use_expand(old_use) |
81 |
|
82 |
use_expand = sorted(self.use_expand) |
83 |
use_expand.insert(0, "USE") |
84 |
@@ -248,7 +243,7 @@ class Display(object): |
85 |
self.verboseadd += _create_use_string(self.conf, key.upper(), |
86 |
cur_iuse_map[key], iuse_forced[key], |
87 |
cur_use_map[key], old_iuse_map[key], |
88 |
- old_use_map[key], self.is_new, feature_flags, |
89 |
+ old_use_map[key], is_new, feature_flags, |
90 |
reinst_flags_map.get(key)) |
91 |
return |