diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-01-31 00:43:52 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-01-31 00:43:52 -0800 |
| commit | 22c952cdc35e5183237029e72dadbe1365e2b110 (patch) | |
| tree | 63c1d7744fd81d555df22d95541b3daecb2cd27e /pym | |
| parent | 5468bd609133a2cdf172e880b103dc8bc6f8c24a (diff) | |
| download | portage-22c952cdc35e5183237029e72dadbe1365e2b110.tar.gz portage-22c952cdc35e5183237029e72dadbe1365e2b110.tar.bz2 portage-22c952cdc35e5183237029e72dadbe1365e2b110.zip | |
Display: align nomerge nodes more
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/resolver/output.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 3346c0782..be07656a4 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -436,9 +436,13 @@ class Display(object): self.verboseadd = None else: if not pkg_info.merge: - myprint = "[%s] %s%s" % \ + addl = "" + if self.conf.verbosity == 3: + # add column for mask status + addl += " " + myprint = "[%s%s] %s%s" % \ (self.pkgprint(pkg_info.operation.ljust(13), pkg_info), - self.indent, self.pkgprint(pkg.cp, pkg_info)) + addl, self.indent, self.pkgprint(pkg.cp, pkg_info)) else: myprint = "[%s %s] %s%s" % \ (self.pkgprint(pkg.type_name, pkg_info), addl, @@ -461,9 +465,13 @@ class Display(object): @rtype the updated addl """ if not pkg_info.merge: - myprint = "[%s] %s%s %s" % \ + addl = "" + if self.conf.verbosity == 3: + # add column for mask status + addl += " " + myprint = "[%s%s] %s%s %s" % \ (self.pkgprint(pkg_info.operation.ljust(13), - pkg_info), + pkg_info), addl, self.indent, self.pkgprint(pkg.cpv, pkg_info), pkg_info.oldbest) else: |