summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/_emerge/resolver/output.py26
1 files changed, 11 insertions, 15 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index 46e22808a..93a2b5dd0 100644
--- a/pym/_emerge/resolver/output.py
+++ b/pym/_emerge/resolver/output.py
@@ -85,9 +85,7 @@ class Display(object):
self.blocker_style = "PKG_BLOCKER"
addl = "%s %s " % (colorize(self.blocker_style, "B"),
fetch_symbol)
- if self.conf.verbosity == 3:
- # add column for mask status
- addl += " "
+ addl += self.empty_space_in_brackets()
self.resolved = dep_expand(
str(pkg.atom).lstrip("!"), mydb=self.vardb,
settings=self.pkgsettings
@@ -181,6 +179,13 @@ class Display(object):
return mask_str
+ def empty_space_in_brackets(self):
+ space = ""
+ if self.conf.verbosity == 3:
+ # add column for mask status
+ space += " "
+ return space
+
def map_to_use_expand(self, myvals, forced_flags=False,
remove_hidden=True):
"""Map use expand variables
@@ -437,10 +442,7 @@ class Display(object):
self.verboseadd = None
else:
if not pkg_info.merge:
- addl = ""
- if self.conf.verbosity == 3:
- # add column for mask status
- addl += " "
+ addl = self.empty_space_in_brackets()
myprint = "[%s%s] %s%s" % \
(self.pkgprint(pkg_info.operation.ljust(13), pkg_info),
addl, self.indent, self.pkgprint(pkg.cp, pkg_info))
@@ -466,10 +468,7 @@ class Display(object):
@rtype the updated addl
"""
if not pkg_info.merge:
- addl = ""
- if self.conf.verbosity == 3:
- # add column for mask status
- addl += " "
+ addl = self.empty_space_in_brackets()
myprint = "[%s%s] %s%s %s" % \
(self.pkgprint(pkg_info.operation.ljust(13),
pkg_info), addl,
@@ -827,10 +826,7 @@ class Display(object):
addl, pkg_info, pkg)
else:
if not pkg_info.merge:
- addl = ""
- if self.conf.verbosity == 3:
- # add column for mask status
- addl += " "
+ addl = self.empty_space_in_brackets()
myprint = "[%s%s] " % (
self.pkgprint(pkg_info.operation.ljust(13),
pkg_info), addl,