[Piuparts-commits] [piuparts] 06/06: lib/db: factor out _get_package_weight()

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit c180028159ad72ca2a3cbaaf83f97a19287eb93a
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Nov 24 03:30:55 2013 +0100

    lib/db: factor out _get_package_weight()
    
    used for ranking packages that are waiting to be tested
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 piupartslib/packagesdb.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index 1722741..07731d6 100644
--- a/piupartslib/packagesdb.py
+++ b/piupartslib/packagesdb.py
@@ -691,6 +691,12 @@ class PackagesDB:
                 return state
         return package_state
 
+    def _get_package_weight(self, p):
+        waiting_count = self.waiting_count(p["Package"])
+        rdep_chain_len = self.rdep_chain_len(p["Package"])
+
+        return waiting_count * rdep_chain_len
+
     def _find_packages_ready_for_testing(self):
         if self._candidates_for_testing is None:
             self._candidates_for_testing = [self.get_package(pn)
@@ -699,10 +705,9 @@ class PackagesDB:
                     if not self._logdb.log_exists(p, [self._reserved]) or \
                             self._logdb.log_exists(p, [self._recycle])]
             if len(self._candidates_for_testing) > 1:
-                tuples = [(self.waiting_count(p["Package"]) * self.rdep_chain_len(p["Package"]),
-                           random.random(), p)
+                tuples = [(self._get_package_weight(p), random.random(), p)
                         for p in self._candidates_for_testing]
-                self._candidates_for_testing = [x[2]
+                self._candidates_for_testing = [x[-1]
                         for x in sorted(tuples, reverse=True)]
         return self._candidates_for_testing[:]
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git