diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-06-20 21:42:49 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-06-20 21:42:49 -0700 |
| commit | e232dfec84dbd2506616ffd39b3d11fa7b2f1d22 (patch) | |
| tree | ec7448f47ab2a5502095e2c112bb3b475fbe5a53 | |
| parent | 7a294d7fdc75ef71823c84f46e868326d308d638 (diff) | |
| download | portage-e232dfec84dbd2506616ffd39b3d11fa7b2f1d22.tar.gz portage-e232dfec84dbd2506616ffd39b3d11fa7b2f1d22.tar.bz2 portage-e232dfec84dbd2506616ffd39b3d11fa7b2f1d22.zip | |
resolver/output: cleanup counters
| -rw-r--r-- | pym/_emerge/resolver/output.py | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 1208bf99b..61cfe9e98 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -516,8 +516,7 @@ class Display(object): @return addl: formatted slot info @return myoldbest: installed version list - Modifies self.counters.downgrades, self.counters.upgrades, - self.counters.binary + Modifies self.counters.downgrades, self.counters.upgrades """ addl = " " + pkg_info.fetch_symbol if not cpvequal(pkg.cpv, @@ -526,15 +525,11 @@ class Display(object): addl += turquoise("U")+blue("D") if pkg_info.ordered: self.counters.downgrades += 1 - if pkg.type_name == "binary": - self.counters.binary += 1 else: # Update in slot addl += turquoise("U") + " " if pkg_info.ordered: self.counters.upgrades += 1 - if pkg.type_name == "binary": - self.counters.binary += 1 return addl @@ -543,13 +538,11 @@ class Display(object): @return addl: formatted slot info @return myoldbest: installed version list - Modifies self.counters.newslot, self.counters.binary + Modifies self.counters.newslot """ addl = " " + green("NS") + pkg_info.fetch_symbol + " " if pkg_info.ordered: self.counters.newslot += 1 - if pkg.type_name == "binary": - self.counters.binary += 1 return addl @@ -651,6 +644,12 @@ class Display(object): pkg_info.built = pkg.type_name != "ebuild" pkg_info.ebuild_path = None pkg_info.repo_name = pkg.repo + if ordered: + if pkg_info.merge: + if pkg.type_name == "binary": + self.counters.binary += 1 + elif pkg_info.operation == "uninstall": + self.counters.uninst += 1 if pkg.type_name == "ebuild": pkg_info.ebuild_path = self.portdb.findname( pkg.cpv, myrepo=pkg_info.repo_name) @@ -751,7 +750,7 @@ class Display(object): @param pkg: _emerge.Package.Package instance @param pkg_info: dictionay @rtype addl, myoldbest: list, myinslotlist: list - Modifies self.counters.reinst, self.counters.binary, self.counters.new + Modifies self.counters.reinst, self.counters.new """ myoldbest = [] @@ -765,10 +764,6 @@ class Display(object): if pkg_info.ordered: if pkg_info.merge: self.counters.reinst += 1 - if pkg.type_name == "binary": - self.counters.binary += 1 - elif pkg_info.operation == "uninstall": - self.counters.uninst += 1 # filter out old-style virtual matches elif installed_versions and \ installed_versions[0].cp == pkg.cp: @@ -790,8 +785,6 @@ class Display(object): addl = " " + green("N") + " " + pkg_info.fetch_symbol + " " if pkg_info.ordered: self.counters.new += 1 - if pkg.type_name == "binary": - self.counters.binary += 1 return addl, myoldbest, myinslotlist |