X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Frequest.py;h=7638bf2f73b8701d87cf5a1682d9e1eb2e213d9e;hb=99c8ec16ca741caf94419fa7976525744ce9aed1;hp=efedbb96fb23fc59f3c3f8b55a5b6aaa9f77b512;hpb=b7bf1e2b6deab33a0a91bbeb14f3dddf701707ba;p=tld-builder.git

diff --git a/TLD_Builder/request.py b/TLD_Builder/request.py
index efedbb9..7638bf2 100644
--- a/TLD_Builder/request.py
+++ b/TLD_Builder/request.py
@@ -11,6 +11,7 @@ import urllib
 import cgi
 import pytz
 import tempfile
+import subprocess
 
 import util
 import log
@@ -110,7 +111,7 @@ class Group:
     def dump(self, f):
         f.write("group: %d (id=%s pri=%d)\n" % (self.no, self.id, self.priority))
         f.write("  from: %s\n" % self.requester)
-        f.write("  flags: %s\n" % self.flags.join())
+        f.write("  flags: %s\n" % ' '.join(self.flags))
         f.write("  time: %s\n" % time.asctime(time.localtime(self.time)))
         for b in self.batches:
             b.dump(f)
@@ -148,7 +149,7 @@ class Group:
             'requester': escape(self.requester),
             'priority': self.priority,
             'max_jobs': self.max_jobs,
-            'flags': self.flags.join()
+            'flags': ' '.join(self.flags)
         })
         f.write("<ol>\n")
         for b in self.batches:
@@ -162,7 +163,7 @@ class Group:
          <requester email='%s'>%s</requester>
          <time>%d</time>
          <priority>%d</priority>
-         <maxjobs>%d</maxjobs>\n""" % (self.id, self.no, self.flags.join(),
+         <maxjobs>%d</maxjobs>\n""" % (self.id, self.no, ' '.join(self.flags),
                     escape(self.requester_email), escape(self.requester),
                     self.time, self.priority, self.max_jobs))
         for b in self.batches:
@@ -294,7 +295,7 @@ class Batch:
         builders = []
         for b in self.builders:
             builders.append("%s:%s" % (b, self.builders_status[b]))
-        f.write("    builders: %s\n" % builders.join())
+        f.write("    builders: %s\n" % ' '.join(builders))
 
     def is_command(self):
         return self.command != ""
@@ -329,7 +330,7 @@ class Batch:
             desc = "SH: <pre>%s</pre> flags: [%s]" % (self.command, ' '.join(self.command_flags))
         else:
             cmd = "/usr/bin/git ls-remote --heads git://git.tld-linux.org/packages/%s 1>/dev/null 2>&1" % (self.spec[:-5])
-            r = call(cmd, shell=True)
+            r = subprocess.call(cmd, shell=True)
             if r == 0:
                 package_url = "http://git.tld-linux.org/?p=packages/%(package)s.git;a=blob;f=%(spec)s;hb=%(branch)s" % {
                     'spec': urllib.quote(self.spec),
@@ -401,7 +402,7 @@ class Batch:
                     'tooltip' : cgi.escape(tooltip, True),
             }
             + link_post)
-        f.write("%s]</small></li>\n" % builders.join())
+        f.write("%s]</small></li>\n" % ' '.join(builders))
 
     def rpmbuild_opts(self):
         """
@@ -501,7 +502,7 @@ class Batch:
            <spec>%s</spec>
            <branch>%s</branch>
            <info>%s</info>\n""" % (self.b_id,
-                 list(map(lambda b: b.b_id, self.depends_on)).join(),
+                 ' '.join(list(map(lambda b: b.b_id, self.depends_on))),
                  escape(self.src_rpm),
                  escape(' '.join(self.command_flags)), escape(self.command),
                  escape(self.spec), escape(self.branch), escape(self.info)))