[gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/
Date: Thu, 21 Jun 2012 04:43:00 +0000 (UTC)	[thread overview]
Message-ID: <1340253769.e232dfec84dbd2506616ffd39b3d11fa7b2f1d22.zmedico@gentoo> (raw)

commit:     e232dfec84dbd2506616ffd39b3d11fa7b2f1d22
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 04:42:49 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 04:42:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e232dfec

resolver/output: cleanup counters

---
 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 1208bf9..61cfe9e 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

next             reply	other threads:[~2012-06-21  4:43 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-21  4:43 Zac Medico [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-10-04  0:30 [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/ Zac Medico
2016-12-19  5:15 Zac Medico
2016-05-27  8:33 Alexander Berntsen
2015-08-03 18:36 Zac Medico
2015-07-29 18:44 Zac Medico
2014-12-13 14:51 Arfrever Frehtes Taifersar Arahesis
2014-08-23  7:21 Zac Medico
2014-02-23 21:38 Sebastian Luther
2014-02-05 19:42 Sebastian Luther
2014-02-05 19:42 Sebastian Luther
2013-03-20 20:32 Zac Medico
2013-03-20 19:23 Zac Medico
2013-03-18 21:28 Zac Medico
2013-03-18 21:12 Zac Medico
2013-03-18 20:58 Zac Medico
2013-02-28  0:25 Zac Medico
2013-02-28  0:12 Zac Medico
2013-02-27 23:39 Zac Medico
2013-01-24  1:18 Zac Medico
2012-10-15 17:17 Arfrever Frehtes Taifersar Arahesis
2012-10-15  4:06 Arfrever Frehtes Taifersar Arahesis
2012-10-14 20:02 Arfrever Frehtes Taifersar Arahesis
2012-10-14 19:54 Arfrever Frehtes Taifersar Arahesis
2012-10-14  2:53 Zac Medico
2012-10-14  2:44 Zac Medico
2012-09-25  2:00 Zac Medico
2012-09-24  3:12 Zac Medico
2012-09-14  2:08 Zac Medico
2012-09-14  1:04 Zac Medico
2012-06-27 21:56 Zac Medico
2012-06-23  6:00 Zac Medico
2012-06-20 21:24 Zac Medico
2012-04-05 19:37 Zac Medico
2012-03-22 19:00 Zac Medico
2012-03-22 18:10 Zac Medico
2012-03-22 17:38 Zac Medico
2012-03-22 17:15 Zac Medico
2012-03-13 17:22 Zac Medico
2012-01-28  2:23 Arfrever Frehtes Taifersar Arahesis
2012-01-28  1:51 Arfrever Frehtes Taifersar Arahesis
2012-01-23 17:13 Arfrever Frehtes Taifersar Arahesis
2012-01-22  3:57 Arfrever Frehtes Taifersar Arahesis
2012-01-22  3:47 Arfrever Frehtes Taifersar Arahesis
2011-11-18  5:58 Zac Medico
2011-11-18  1:43 Zac Medico
2011-11-07 18:34 Zac Medico
2011-11-07  7:37 Zac Medico
2011-10-19 21:32 Zac Medico
2011-10-19 21:25 Zac Medico
2011-10-02 20:11 Zac Medico
2011-09-17 17:51 Zac Medico
2011-07-27 10:34 Zac Medico
2011-07-10 13:35 Zac Medico
2011-07-10 12:23 Zac Medico
2011-07-10 10:41 Zac Medico
2011-07-10  1:58 Zac Medico
2011-07-10  1:31 Zac Medico
2011-07-09 22:24 Zac Medico
2011-06-21  8:15 Zac Medico
2011-06-11  1:31 Zac Medico
2011-03-15 22:59 Zac Medico

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:1208bf9 dfblob:61cfe9e )
 OR (
bs:"[gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1340253769.e232dfec84dbd2506616ffd39b3d11fa7b2f1d22.zmedico@gentoo \
    --to=zmedico@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox