From: Zac Medico Date: Wed, 20 Mar 2013 20:32:27 +0000 (-0700) Subject: Fix --verbose-main-repo-display missing PORTDIR. X-Git-Tag: v2.2.0_alpha169~4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77df7ad2311f8d30533b89d4560651f3eac72cef;p=portage.git Fix --verbose-main-repo-display missing PORTDIR. --- diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index a14478ee1..3e8552f37 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -385,7 +385,8 @@ class Display(object): if old_pkg.slot != old_pkg.sub_slot or \ old_pkg.slot == pkg.slot and old_pkg.sub_slot != pkg.sub_slot: key += "/" + old_pkg.sub_slot - if not self.quiet_repo_display and self.portdb.repositories.mainRepo() and (self.verbose_main_repo_display or + if not self.quiet_repo_display and (self.verbose_main_repo_display or + self.portdb.repositories.mainRepo() is None or any(x.repo != self.portdb.repositories.mainRepo().name for x in myoldbest + [pkg])): key += _repo_separator + old_pkg.repo versions.append(key) @@ -419,7 +420,8 @@ class Display(object): @param pkg_info: dictionary @rtype string """ - if not self.quiet_repo_display and self.portdb.repositories.mainRepo() and (self.verbose_main_repo_display or + if not self.quiet_repo_display and (self.verbose_main_repo_display or + self.portdb.repositories.mainRepo() is None or any(x.repo != self.portdb.repositories.mainRepo().name for x in pkg_info.oldbest_list + [pkg])): pkg_str += _repo_separator + pkg.repo return pkg_str