[Pkg-debile-commits] [debile-web] 01/01: Update queue ordering to match the simplified behavior of debile-master

[Jon Severinsson]

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

jonno-guest pushed a commit to branch master
in repository debile-web.

commit 2e87e72c64ac467131beae149bf5bc7a91cfb431
Author: Jon Severinsson <jon at severinsson.net>
Date:   Sat Jun 21 16:32:41 2014 +0200

    Update queue ordering to match the simplified behavior of debile-master
---
 debileweb/blueprints/frontend.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debileweb/blueprints/frontend.py b/debileweb/blueprints/frontend.py
index 78401b0..d26d433 100644
--- a/debileweb/blueprints/frontend.py
+++ b/debileweb/blueprints/frontend.py
@@ -218,9 +218,9 @@ def sources(search="", prefix="recent", page=0):
                     Job.failed.is_(None)
                 ),
             ).order_by(
-                asc(select([func.min(
-                        Job.assigned_count - select([func.count(1)]).where(job_dependencies.c.blocking_job_id == Job.id)
-                    )]).where(
+                asc(select(
+                        [func.min(Job.assigned_count)]
+                    ).where(
                         (Job.source_id == Source.id) &
                         ~Job.depedencies.any() &
                         (Job.dose_report == None) &
@@ -324,7 +324,7 @@ def jobs(prefix="recent", page=0):
                 Job.finished_at == None,
                 Job.failed.is_(None),
             ).order_by(
-                asc(Job.assigned_count - select([func.count(1)]).where(job_dependencies.c.blocking_job_id == Job.id)),
+                Job.assigned_count.asc(),
                 Source.uploaded_at.asc(),
             )
         elif prefix == "unbuilt":

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