import xml.sax.saxutils
import fnmatch
import os
-import urllib
-import cgi
+import urllib.parse
+import html
import pytz
import tempfile
+import subprocess
import util
import log
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),
- '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 (<a href=\"%(package_url)s\">%(spec)s -r %(branch)s</a>%(rpmopts)s)" % {
'src_rpm': self.src_rpm,
tree_name = '-'.join(bld[:-1])
tree_arch = '-'.join(bld[-1:])
link_pre = "<a href=\"http://buildlogs.tld-linux.org/index.php?dist=%s&arch=%s&name=%s&id=%s&action=download\">" \
- % (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 = "</a>"
def ftime(s):
'color' : c,
'builder' : b,
'status' : s,
- 'tooltip' : cgi.escape(tooltip, True),
+ 'tooltip' : html.escape(tooltip, True),
}
+ link_post)
f.write("%s]</small></li>\n" % ' '.join(builders))