import cgi
import pytz
import tempfile
+import subprocess
import util
import log
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)
'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:
<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:
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 != ""
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),
'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):
"""
<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)))