| 1 |
commit: b0ee82d8502a8f4ed11fefb3d01dba1d7cb5145d |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 31 01:11:57 2011 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 31 01:11:57 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b0ee82d8 |
| 7 |
|
| 8 |
Display: show masks in the [ ] part |
| 9 |
|
| 10 |
Symbol | Mask Type |
| 11 |
-------|----------------- |
| 12 |
# | package.mask |
| 13 |
* | missing keyword |
| 14 |
~ | unstable keyword |
| 15 |
|
| 16 |
--- |
| 17 |
pym/_emerge/resolver/output.py | 27 ++++++++++++++++----------- |
| 18 |
1 files changed, 16 insertions(+), 11 deletions(-) |
| 19 |
|
| 20 |
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py |
| 21 |
index ffee6da..f2e2600 100644 |
| 22 |
--- a/pym/_emerge/resolver/output.py |
| 23 |
+++ b/pym/_emerge/resolver/output.py |
| 24 |
@@ -157,20 +157,24 @@ class Display(object): |
| 25 |
self.pkgsettings["USE_EXPAND_HIDDEN"].lower().split() |
| 26 |
return |
| 27 |
|
| 28 |
- def _display_keyword(self, pkg): |
| 29 |
- """ keyword display |
| 30 |
- |
| 31 |
+ def gen_mask_str(self, pkg): |
| 32 |
+ """ |
| 33 |
@param pkg: _emerge.Package instance |
| 34 |
- Modifies self.verboseadd |
| 35 |
""" |
| 36 |
used_keyword = pkg.accepted_keyword() |
| 37 |
hardmasked = pkg.isHardMasked() |
| 38 |
- if used_keyword not in self.pkgsettings['ACCEPT_KEYWORDS'].split() or hardmasked: |
| 39 |
- if hardmasked: |
| 40 |
- self.verboseadd += 'keyword=' + red('[%s] ' % used_keyword) |
| 41 |
+ |
| 42 |
+ if hardmasked: |
| 43 |
+ mask_str = colorize("BAD", "#") |
| 44 |
+ elif used_keyword not in self.pkgsettings['ACCEPT_KEYWORDS'].split(): |
| 45 |
+ if used_keyword == "**": |
| 46 |
+ mask_str = colorize("BAD", "*") |
| 47 |
else: |
| 48 |
- self.verboseadd += 'keyword=' + yellow('%s ' % used_keyword) |
| 49 |
- return |
| 50 |
+ mask_str = colorize("WARN", "~") |
| 51 |
+ else: |
| 52 |
+ mask_str = " " |
| 53 |
+ |
| 54 |
+ return mask_str |
| 55 |
|
| 56 |
def map_to_use_expand(self, myvals, forced_flags=False, |
| 57 |
remove_hidden=True): |
| 58 |
@@ -784,8 +788,6 @@ class Display(object): |
| 59 |
self._get_installed_best(pkg, pkg_info) |
| 60 |
self.verboseadd = "" |
| 61 |
self.repoadd = None |
| 62 |
- if self.conf.verbosity == 3: |
| 63 |
- self._display_keyword(pkg) |
| 64 |
self._display_use(pkg, pkg_info.oldbest, myinslotlist) |
| 65 |
self.recheck_hidden(pkg) |
| 66 |
if self.conf.verbosity == 3: |
| 67 |
@@ -801,6 +803,9 @@ class Display(object): |
| 68 |
self.check_system_world(pkg) |
| 69 |
addl = self.set_interactive(pkg, pkg_info.ordered, addl) |
| 70 |
|
| 71 |
+ if self.conf.verbosity == 3: |
| 72 |
+ addl += self.gen_mask_str(pkg) |
| 73 |
+ |
| 74 |
if pkg.root != "/": |
| 75 |
if pkg_info.oldbest: |
| 76 |
pkg_info.oldbest += " " |
Archives