| 1 |
commit: b2660f0560e1867f05841a00b6cd287cd5d8e0f0 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 28 00:12:42 2013 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 28 00:12:42 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b2660f05 |
| 7 |
|
| 8 |
Display: unsplit _display_use method parts |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/resolver/output.py | 68 ++++++++++++++++++--------------------- |
| 12 |
1 files changed, 31 insertions(+), 37 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py |
| 15 |
index 335cf27..1ebb248 100644 |
| 16 |
--- a/pym/_emerge/resolver/output.py |
| 17 |
+++ b/pym/_emerge/resolver/output.py |
| 18 |
@@ -116,38 +116,6 @@ class Display(object): |
| 19 |
else: |
| 20 |
self.blockers.append(addl) |
| 21 |
|
| 22 |
- def _display_use(self, pkg, pkg_info): |
| 23 |
- """ USE flag display |
| 24 |
- |
| 25 |
- @param pkg: _emerge.Package.Package instance |
| 26 |
- Modifies class globals: self.forced_flags, self.cur_iuse, |
| 27 |
- self.old_iuse, self.old_use, self.use_expand |
| 28 |
- """ |
| 29 |
- |
| 30 |
- self.forced_flags = set() |
| 31 |
- self.forced_flags.update(pkg.use.force) |
| 32 |
- self.forced_flags.update(pkg.use.mask) |
| 33 |
- |
| 34 |
- self.cur_use = [flag for flag in self.conf.pkg_use_enabled(pkg) \ |
| 35 |
- if flag in pkg.iuse.all] |
| 36 |
- self.cur_iuse = sorted(pkg.iuse.all) |
| 37 |
- |
| 38 |
- if pkg_info.previous_pkg is not None: |
| 39 |
- previous_pkg = pkg_info.previous_pkg |
| 40 |
- self.old_iuse = sorted(previous_pkg.iuse.all) |
| 41 |
- self.old_use = previous_pkg.use.enabled |
| 42 |
- self.is_new = False |
| 43 |
- else: |
| 44 |
- self.old_iuse = [] |
| 45 |
- self.old_use = [] |
| 46 |
- self.is_new = True |
| 47 |
- |
| 48 |
- self.old_use = [flag for flag in self.old_use if flag in self.old_iuse] |
| 49 |
- |
| 50 |
- self.use_expand = pkg.use.expand |
| 51 |
- self.use_expand_hidden = pkg.use.expand_hidden |
| 52 |
- return |
| 53 |
- |
| 54 |
def include_mask_str(self): |
| 55 |
return self.conf.verbosity > 1 |
| 56 |
|
| 57 |
@@ -211,13 +179,40 @@ class Display(object): |
| 58 |
return ret |
| 59 |
|
| 60 |
|
| 61 |
- def recheck_hidden(self, pkg): |
| 62 |
- """ Prevent USE_EXPAND_HIDDEN flags from being hidden if they |
| 63 |
- are the only thing that triggered reinstallation. |
| 64 |
+ def _display_use(self, pkg, pkg_info): |
| 65 |
+ """ USE flag display |
| 66 |
|
| 67 |
@param pkg: _emerge.Package.Package instance |
| 68 |
- Modifies self.use_expand_hidden, self.use_expand, self.verboseadd |
| 69 |
+ @param pkg_info: PkgInfo instance |
| 70 |
+ Modifies self.use_expand_hidden, self.use_expand, self.verboseadd, |
| 71 |
+ self.forced_flags, self.cur_iuse, self.old_iuse, self.old_use |
| 72 |
""" |
| 73 |
+ |
| 74 |
+ self.forced_flags = set() |
| 75 |
+ self.forced_flags.update(pkg.use.force) |
| 76 |
+ self.forced_flags.update(pkg.use.mask) |
| 77 |
+ |
| 78 |
+ self.cur_use = [flag for flag in self.conf.pkg_use_enabled(pkg) \ |
| 79 |
+ if flag in pkg.iuse.all] |
| 80 |
+ self.cur_iuse = sorted(pkg.iuse.all) |
| 81 |
+ |
| 82 |
+ if pkg_info.previous_pkg is not None: |
| 83 |
+ previous_pkg = pkg_info.previous_pkg |
| 84 |
+ self.old_iuse = sorted(previous_pkg.iuse.all) |
| 85 |
+ self.old_use = previous_pkg.use.enabled |
| 86 |
+ self.is_new = False |
| 87 |
+ else: |
| 88 |
+ self.old_iuse = [] |
| 89 |
+ self.old_use = [] |
| 90 |
+ self.is_new = True |
| 91 |
+ |
| 92 |
+ self.old_use = [flag for flag in self.old_use if flag in self.old_iuse] |
| 93 |
+ |
| 94 |
+ self.use_expand = pkg.use.expand |
| 95 |
+ self.use_expand_hidden = pkg.use.expand_hidden |
| 96 |
+ |
| 97 |
+ # Prevent USE_EXPAND_HIDDEN flags from being hidden if they |
| 98 |
+ # are the only thing that triggered reinstallation. |
| 99 |
reinst_flags_map = {} |
| 100 |
reinstall_for_flags = self.conf.reinstall_nodes.get(pkg) |
| 101 |
reinst_expand_map = None |
| 102 |
@@ -845,7 +840,6 @@ class Display(object): |
| 103 |
if self.quiet_repo_display: |
| 104 |
self.repoadd = None |
| 105 |
self._display_use(pkg, pkg_info) |
| 106 |
- self.recheck_hidden(pkg) |
| 107 |
if self.conf.verbosity == 3: |
| 108 |
if self.quiet_repo_display: |
| 109 |
self.verbose_size(pkg, repoadd_set, pkg_info) |
Archives