From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 10 May 2011 05:05:40 +0000 (-0700)
Subject: get_counter_tick_core: use cpv_all
X-Git-Tag: v2.2.0_alpha33~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5a51b2b7952eabc56bed8e2e04b2596e7495e16;p=portage.git

get_counter_tick_core: use cpv_all

It's more efficient to use cpv_all since cp_all calls cpv_all anyway,
and calls to cp_list induce additional stat calls.
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 7c6602752..41a932991 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -764,16 +764,14 @@ class vardbapi(dbapi):
 			# to newly installed packages having lower
 			# COUNTERs than the previous version in the
 			# same slot.
-			cp_list = self.cp_list
 			max_counter = counter
-			for cp in self.cp_all():
-				for cpv in cp_list(cp):
-					try:
-						pkg_counter = int(self.aux_get(cpv, ["COUNTER"])[0])
-					except (KeyError, OverflowError, ValueError):
-						continue
-					if pkg_counter > max_counter:
-						max_counter = pkg_counter
+			for cpv in self.cpv_all():
+				try:
+					pkg_counter = int(self.aux_get(cpv, ["COUNTER"])[0])
+				except (KeyError, OverflowError, ValueError):
+					continue
+				if pkg_counter > max_counter:
+					max_counter = pkg_counter
 
 		if counter < 0 and not new_vdb:
 			writemsg(_("!!! Initializing COUNTER to " \