diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-12-23 10:44:04 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-12-23 10:44:04 -0800 |
| commit | 8ffad57abdaf0904df1e8488dc4c55e201af391e (patch) | |
| tree | 389e8cb6e999c184ff18f8e73fcb63a85c6a2447 /pym/_emerge/resolver/output.py | |
| parent | 7548cc347065cecf5cb353e084b7ef88ea2d8a94 (diff) | |
| download | portage-8ffad57abdaf0904df1e8488dc4c55e201af391e.tar.gz portage-8ffad57abdaf0904df1e8488dc4c55e201af391e.tar.bz2 portage-8ffad57abdaf0904df1e8488dc4c55e201af391e.zip | |
Fix merge list repo display breakage.
Broken since refactoring in commit
48c8cec7c079cb07a4f421a36cdc46a7fdbc7811.
Diffstat (limited to 'pym/_emerge/resolver/output.py')
| -rw-r--r-- | pym/_emerge/resolver/output.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index af8b9401e..502aaeed7 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -326,7 +326,7 @@ class Display(object): # now use the data to generate output if pkg.installed or not slot_matches: - repoadd = self.conf.repo_display.repoStr( + self.repoadd = self.conf.repo_display.repoStr( pkg_info.repo_path_real) else: repo_path_prev = None @@ -334,14 +334,14 @@ class Display(object): repo_path_prev = self.portdb.getRepositoryPath( repo_name_prev) if repo_path_prev == pkg_info.repo_path_real: - repoadd = self.conf.repo_display.repoStr( + self.repoadd = self.conf.repo_display.repoStr( pkg_info.repo_path_real) else: - repoadd = "%s=>%s" % ( + self.repoadd = "%s=>%s" % ( self.conf.repo_display.repoStr(repo_path_prev), self.conf.repo_display.repoStr(pkg_info.repo_path_real)) - if repoadd: - repoadd_set.add(repoadd) + if self.repoadd: + repoadd_set.add(self.repoadd) @staticmethod @@ -785,7 +785,7 @@ class Display(object): addl, pkg_info.oldbest, myinslotlist = \ self._get_installed_best(pkg, pkg_info) self.verboseadd = "" - repoadd = None + self.repoadd = None self._display_use(pkg, pkg_info.oldbest, myinslotlist) self.recheck_hidden(pkg) if self.conf.verbosity == 3: @@ -829,7 +829,7 @@ class Display(object): if self.conf.columns and pkg.operation == "uninstall": continue - self.print_msg.append((myprint, self.verboseadd, repoadd)) + self.print_msg.append((myprint, self.verboseadd, self.repoadd)) if not self.conf.tree_display \ and not self.conf.no_restart \ |