Display: tweak output and docs for bug 58416

Now the masking display is disabled by the --quiet option if the
--verbose  option is not enabled simultaneously. Also, docs are
updated as per bug 58416, comment #11 and #12.

diff --git a/man/emerge.1 b/man/emerge.1
index 05498ff97c7bcda2ecc4f72b58ae92d0e242c067..311ce75c7cc7d64894e26be271f36a5053c7ac6f 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -721,11 +721,12 @@ displayed.
 .B [ebuild     U *] sys\-apps/portage\-2.2.0_alpha6 [2.1.9.25]
 Portage 2.1.9.25 is installed, but if you run the command, then
 portage will upgrade to version 2.2.0_alpha6. In this case,
-\fB\-\-verbose\fR causes the \fB*\fR symbol to be displayed, in
-order to indicate that version 2.2.0_alpha6 is masked by missing
-keyword. The following symbols are used to indicate various types
+the \fB*\fR symbol is displayed, in order to indicate that version
+2.2.0_alpha6 is masked by missing keyword. This type of masking
+display is disabled by the \fB\-\-quiet\fR option if the
+\fB\-\-verbose\fR option is not enabled simultaneously.
+The following symbols are used to indicate various types
 of masking:
-
 .TS
 l l
 __
@@ -736,6 +737,10 @@ Symbol     Mask Type
 *      missing keyword
 ~      unstable keyword
 .TE
+
+\fBNOTE:\fR The unstable keyword symbol (~) will not be shown in cases
+in which the corresponding unstable keywords have been accepted
+globally via \fBACCEPT_KEYWORDS\fR.
 .TP
 
 

diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index 93a2b5dd0992766e68a73842f5314f797d4a88d8..0e7585d29afcd220c184f43b79be9a168cad0114 100644 (file)
--- a/pym/_emerge/resolver/output.py
+++ b/pym/_emerge/resolver/output.py
@@ -158,6 +158,9 @@ class Display(object):
                        self.pkgsettings["USE_EXPAND_HIDDEN"].lower().split()
                return
 
+       def include_mask_str(self):
+               return self.conf.verbosity > 1
+
        def gen_mask_str(self, pkg):
                """
                @param pkg: _emerge.Package instance
@@ -181,7 +184,7 @@ class Display(object):
 
        def empty_space_in_brackets(self):
                space = ""
-               if self.conf.verbosity == 3:
+               if self.include_mask_str():
                        # add column for mask status
                        space += " "
                return space
@@ -815,7 +818,7 @@ class Display(object):
                                        self.check_system_world(pkg)
                                addl = self.set_interactive(pkg, pkg_info.ordered, addl)
 
-                               if self.conf.verbosity == 3:
+                               if self.include_mask_str():
                                        addl += self.gen_mask_str(pkg)
 
                                if pkg.root != "/":