X-Git-Url: https://git.tld-linux.org/?p=tld-builder.git;a=blobdiff_plain;f=TLD_Builder%2Frequest.py;h=efedbb96fb23fc59f3c3f8b55a5b6aaa9f77b512;hp=2e1e7c3d094e951bfe44401bd331e9bbfb68ebb1;hb=b7bf1e2b6deab33a0a91bbeb14f3dddf701707ba;hpb=2fe650f5b1d5ea349156486ac7209b8b3abf6ba7
diff --git a/TLD_Builder/request.py b/TLD_Builder/request.py
index 2e1e7c3..efedbb9 100644
--- a/TLD_Builder/request.py
+++ b/TLD_Builder/request.py
@@ -110,7 +110,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" % self.flags.join())
f.write(" time: %s\n" % time.asctime(time.localtime(self.time)))
for b in self.batches:
b.dump(f)
@@ -148,7 +148,7 @@ class Group:
'requester': escape(self.requester),
'priority': self.priority,
'max_jobs': self.max_jobs,
- 'flags': string.join(self.flags)
+ 'flags': self.flags.join()
})
f.write("
\n")
for b in self.batches:
@@ -162,7 +162,7 @@ class Group:
%s
%d
- %d\n""" % (self.id, self.no, string.join(self.flags),
+ %d\n""" % (self.id, self.no, self.flags.join(),
escape(self.requester_email), escape(self.requester),
self.time, self.priority, self.max_jobs))
for b in self.batches:
@@ -294,7 +294,7 @@ class Batch:
builders = []
for b in self.builders:
builders.append("%s:%s" % (b, self.builders_status[b]))
- f.write(" builders: %s\n" % string.join(builders))
+ f.write(" builders: %s\n" % builders.join())
def is_command(self):
return self.command != ""
@@ -401,7 +401,7 @@ class Batch:
'tooltip' : cgi.escape(tooltip, True),
}
+ link_post)
- f.write("%s]\n" % string.join(builders))
+ f.write("%s]\n" % builders.join())
def rpmbuild_opts(self):
"""
@@ -501,7 +501,7 @@ class Batch:
%s
%s
%s\n""" % (self.b_id,
- string.join(list(map(lambda b: b.b_id, self.depends_on))),
+ list(map(lambda b: b.b_id, self.depends_on)).join(),
escape(self.src_rpm),
escape(' '.join(self.command_flags)), escape(self.command),
escape(self.spec), escape(self.branch), escape(self.info)))