- don't kill processes, it intereferes with other builder chroots

[tld-builder.git] / TLD_Builder / rpm_builder.py

diff --git a/TLD_Builder/rpm_builder.py b/TLD_Builder/rpm_builder.py
index 65ab8e21513653a3415a4960d0da1a87f9be6592..dc06fff57f7d70e876ae046025e977ca8f8698aa 100644 (file)
--- a/TLD_Builder/rpm_builder.py
+++ b/TLD_Builder/rpm_builder.py
@@ -8,12 +8,15 @@ import atexit
 import time
 import datetime
 import string
-import urllib
+import urllib.request
+import urllib.parse
+import urllib.error
 
 from config import config, init_conf
 from bqueue import B_Queue
 import lock
 import util
+import shutil
 import loop
 import path
 import status
@@ -45,9 +48,9 @@ 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(key=util.cmp_to_key(mycmp))
@@ -125,14 +128,15 @@ def fetch_src(r, b):
                     print("error.reason exception %s" % e)
                 raise
 
-    o = chroot.popen("cat > %s" % b.src_rpm, mode = "wb")
+    o = chroot.popen("cat > %s" % b.src_rpm, mode = "w")
 
     try:
-        bytes = util.sendfile(f, o)
+        shutil.copyfileobj(f, o)
     except IOError as e:
         b.log_line("error: unable to write to `%s': %s" % (b.src_rpm, e))
         raise
 
+    bytes = float(f.headers['content-length'])
     f.close()
     o.close()
     t = time.time() - start
@@ -182,9 +186,6 @@ def build_rpm(r, b):
 
     b.log_line("started at: %s" % time.asctime())
 
-    b.log_line("killing old processes on a builder")
-    chroot.run("/bin/kill --verbose -9 -1", logfile = b.logfile)
-
     b.log_line("cleaning up /tmp")
     chroot.run("rm -rf /tmp/B.*", logfile = b.logfile)