X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=TLD_Builder%2Frequest.py;h=25ca994b844a9d6a4a9528f8713d473863053f54;hb=a17cb2c203c09f61fb0e8b2f4f71e4e3a2da6571;hp=2e1e7c3d094e951bfe44401bd331e9bbfb68ebb1;hpb=98531ab4a0e4e065d3b11b051b3e4bd7653c6ac0;p=tld-builder.git diff --git a/TLD_Builder/request.py b/TLD_Builder/request.py index 2e1e7c3..25ca994 100644 --- a/TLD_Builder/request.py +++ b/TLD_Builder/request.py @@ -8,9 +8,10 @@ import xml.sax.saxutils import fnmatch import os import urllib -import cgi +import html 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" % string.join(self.flags)) + 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': string.join(self.flags) + 'flags': ' '.join(self.flags) }) f.write("
%sflags: [%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), - 'branch': urllib.quote(self.branch), - 'package': urllib.quote(self.spec[:-5]), + 'spec': urllib.parse.quote(self.spec), + 'branch': urllib.parse.quote(self.branch), + 'package': urllib.parse.quote(self.spec[:-5]), } else: package_url = "http://git.pld-linux.org/gitweb.cgi?p=packages/%(package)s.git;f=%(spec)s;h=%(branch)s;a=shortlog" % { - 'spec': urllib.quote(self.spec), - 'branch': urllib.quote(self.branch), - 'package': urllib.quote(self.spec[:-5]), + 'spec': urllib.parse.quote(self.spec), + 'branch': urllib.parse.quote(self.branch), + 'package': urllib.parse.quote(self.spec[:-5]), } desc = "%(src_rpm)s (%(spec)s -r %(branch)s%(rpmopts)s)" % { 'src_rpm': self.src_rpm, @@ -379,7 +380,7 @@ class Batch: tree_name = '-'.join(bld[:-1]) tree_arch = '-'.join(bld[-1:]) link_pre = "" \ - % (urllib.quote(tree_name), urllib.quote(tree_arch), urllib.quote(bl_name), urllib.quote(rid)) + % (urllib.parse.quote(tree_name), urllib.parse.quote(tree_arch), urllib.parse.quote(bl_name), urllib.parse.quote(rid)) link_post = "" def ftime(s): @@ -398,10 +399,10 @@ class Batch: 'color' : c, 'builder' : b, 'status' : s, - 'tooltip' : cgi.escape(tooltip, True), + 'tooltip' : html.escape(tooltip, True), } + link_post) - f.write("%s]\n" % string.join(builders)) + f.write("%s]\n" % ' '.join(builders)) def rpmbuild_opts(self): """ @@ -501,7 +502,7 @@ class Batch: