From 6e28eedeb65ea166e8dcca3f0570817703fc53ed Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 12 Nov 2008 19:22:24 +0000 Subject: [PATCH] Sort the return value from cpv_all() inside vardbapi._counter_hash() instead of sorting them in side cpv_all(). Thanks to Brian Harring for the suggestion. svn path=/main/trunk/; revision=11865 --- pym/portage/dbapi/vartree.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index c3628491d..d8e676e8c 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -780,7 +780,9 @@ class vardbapi(dbapi): from md5 import new as new_hash h = new_hash() aux_keys = ["COUNTER"] - for cpv in self.cpv_all(): + cpv_list = self.cpv_all() + cpv_list.sort() + for cpv in cpv_list: try: counter, = self.aux_get(cpv, aux_keys) except KeyError: @@ -931,7 +933,7 @@ class vardbapi(dbapi): self.invalidentry(self.getpath(subpath)) continue returnme.append(subpath) - returnme.sort() + return returnme def cp_all(self, use_cache=1): -- 2.26.2