diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2012-01-22 04:53:59 +0100 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2012-01-22 04:53:59 +0100 |
| commit | 47f16923b2f90ed589f21f44cf04abf5663b76f6 (patch) | |
| tree | fd0e0efec9662f5e1bb52c8aba45cf82d96e6cba /pym | |
| parent | 8118be36842a2db2eb72538e21a3b343773b3365 (diff) | |
| download | portage-47f16923b2f90ed589f21f44cf04abf5663b76f6.tar.gz portage-47f16923b2f90ed589f21f44cf04abf5663b76f6.tar.bz2 portage-47f16923b2f90ed589f21f44cf04abf5663b76f6.zip | |
Make the second part of_emerge.resolver.output.Display.verbose_size()
conditional on self.quiet_repo_display instead of earlier returning
if self.quiet_repo_display is False. No functional changes.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/resolver/output.py | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index c9124438a..b10e80227 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -339,36 +339,34 @@ class Display(object): self.counters.totalsize += mysize self.verboseadd += _format_size(mysize) - if not self.quiet_repo_display: - return - - # overlay verbose - # assign index for a previous version in the same slot - slot_matches = self.vardb.match(pkg.slot_atom) - if slot_matches: - repo_name_prev = self.vardb.aux_get(slot_matches[0], - ["repository"])[0] - else: - repo_name_prev = None + if self.quiet_repo_display: + # overlay verbose + # assign index for a previous version in the same slot + slot_matches = self.vardb.match(pkg.slot_atom) + if slot_matches: + repo_name_prev = self.vardb.aux_get(slot_matches[0], + ["repository"])[0] + else: + repo_name_prev = None - # now use the data to generate output - if pkg.installed or not slot_matches: - self.repoadd = self.conf.repo_display.repoStr( - pkg_info.repo_path_real) - else: - repo_path_prev = None - if repo_name_prev: - repo_path_prev = self.portdb.getRepositoryPath( - repo_name_prev) - if repo_path_prev == pkg_info.repo_path_real: + # now use the data to generate output + if pkg.installed or not slot_matches: self.repoadd = self.conf.repo_display.repoStr( pkg_info.repo_path_real) else: - self.repoadd = "%s=>%s" % ( - self.conf.repo_display.repoStr(repo_path_prev), - self.conf.repo_display.repoStr(pkg_info.repo_path_real)) - if self.repoadd: - repoadd_set.add(self.repoadd) + repo_path_prev = None + if repo_name_prev: + repo_path_prev = self.portdb.getRepositoryPath( + repo_name_prev) + if repo_path_prev == pkg_info.repo_path_real: + self.repoadd = self.conf.repo_display.repoStr( + pkg_info.repo_path_real) + else: + self.repoadd = "%s=>%s" % ( + self.conf.repo_display.repoStr(repo_path_prev), + self.conf.repo_display.repoStr(pkg_info.repo_path_real)) + if self.repoadd: + repoadd_set.add(self.repoadd) def convert_myoldbest(self, myoldbest): |