X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Fsrpm_builder.py;h=ea85d3bfd6a1988ec7231d66f3104755124a87a3;hb=ace2cdc232fa70accd69434e28e41d63b164892b;hp=9e45e55e30614d8a35d190a87c3a3dfda27cc875;hpb=98531ab4a0e4e065d3b11b051b3e4bd7653c6ac0;p=tld-builder.git

diff --git a/TLD_Builder/srpm_builder.py b/TLD_Builder/srpm_builder.py
index 9e45e55..ea85d3b 100644
--- a/TLD_Builder/srpm_builder.py
+++ b/TLD_Builder/srpm_builder.py
@@ -5,10 +5,6 @@ import string
 import time
 import os
 import sys
-if sys.version_info[0] == 2:
-    import StringIO
-else:
-    from io import StringIO
 import re
 import shutil
 import atexit
@@ -27,7 +23,6 @@ import notify
 import status
 import build
 import report
-#import messagebus
 
 from lock import lock
 from bqueue import B_Queue
@@ -37,12 +32,12 @@ def pick_request(q):
     def mycmp(r1, r2):
         if r1.kind != 'group' or r2.kind != 'group':
             raise Exception("non-group requests")
-        pri_diff = cmp(r1.priority, r2.priority)
+        pri_diff = util.cmp(r1.priority, r2.priority)
         if pri_diff == 0:
-            return cmp(r1.time, r2.time)
+            return util.cmp(r1.time, r2.time)
         else:
             return pri_diff
-    q.requests.sort(mycmp)
+    q.requests.sort(key=util.cmp_to_key(mycmp))
     ret = q.requests[0]
     q.requests = q.requests[1:]
     return ret
@@ -100,7 +95,6 @@ def build_srpm(r, b):
         return "FAIL"
 
     status.push("building %s" % b.spec)
-#    messagebus.notify(topic="build_srpm.start", spec=b.spec, flags=r.flags, batch=b, request=r)
 
     b.src_rpm = ""
     builder_opts = "-nu -nm --nodeps --http --define \'_tld_builder 1\'"
@@ -141,7 +135,6 @@ def build_srpm(r, b):
     if res:
         res = "FAIL"
 
-#    messagebus.notify(topic="build_srpm.finish", spec=b.spec)
     return res
 
 def handle_request(r):