[Qa-jenkins-scm] [jenkins.debian.net] 01/01: Revert "reproducible: scheduler: simplify the suite prioritaizing code"

[Holger Levsen]

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

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit eabbb7b382662b5af0bbf30ba2691662af6085b5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Jun 12 20:08:56 2015 +0200

    Revert "reproducible: scheduler: simplify the suite prioritaizing code"
    
    This reverts commit b7198e0e12e5a3a89932f74752640c817cbdf923.
---
 bin/reproducible_scheduler.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_scheduler.py b/bin/reproducible_scheduler.py
index 463f7a6..42ddbae 100755
--- a/bin/reproducible_scheduler.py
+++ b/bin/reproducible_scheduler.py
@@ -307,7 +307,12 @@ def scheduler():
 
     now_queued_here = {}
     # make sure to schedule packages in unstable first
-    for suite in sorted(SUITES, key=lambda x: x != 'unstable')
+    # (but keep the view ordering everywhere else)
+    priotized_suite_order = ['unstable']
+    for suite in SUITES:
+        if suite not in priotized_suite_order:
+            priotized_suite_order.append(suite)
+    for suite in priotized_suite_order:
         query = 'SELECT count(*) ' + \
                 'FROM schedule AS p JOIN sources AS s ON p.package_id=s.id ' + \
                 'WHERE s.suite="{suite}"'.format(suite=suite)

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