[rhmessaging-commits] rhmessaging commits: r2635 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2008-10-14 09:07:18 -0400 (Tue, 14 Oct 2008)
New Revision: 2635

Modified:
   mgmt/trunk/cumin/python/cumin/job.py
Log:
Now seeing Removed jobs without a deletion_time. Check status explicitly in JobSet display

Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py	2008-10-14 12:50:09 UTC (rev 2634)
+++ mgmt/trunk/cumin/python/cumin/job.py	2008-10-14 13:07:18 UTC (rev 2635)
@@ -1231,7 +1231,7 @@
 
         alive = "((c.rec_time is null or " + \
             "c.rec_time <= now() - interval '10 minutes')" + \
-            " and j.deletion_time is null)"
+            " and j.deletion_time is null and j.job_status != %i)" % JobStatusInfo.get_status_int("Removed")
 
         if phase == "a":
             sql = alive
@@ -1245,7 +1245,7 @@
             sql = "(j.job_status = %i" % JobStatusInfo.get_status_int("Held") + \
                     " and %s)" % alive
         else:
-            sql = "j.deletion_time is not null"
+            sql = "j.deletion_time is not null or j.job_status = %i" % JobStatusInfo.get_status_int("Removed")
 
         return sql