X-Git-Url: https://git.tld-linux.org/?p=tld-builder.git;a=blobdiff_plain;f=TLD_Builder%2Frequest.py;h=149557a31573e79081a52fd5bc7172ed93d47f8c;hp=efedbb96fb23fc59f3c3f8b55a5b6aaa9f77b512;hb=c4d0706eae2dd9530000a8ad8b62188c417c2caa;hpb=f49a6ac3665407036232096319a5643e80caedf3 diff --git a/TLD_Builder/request.py b/TLD_Builder/request.py index efedbb9..149557a 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" % 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 +148,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("
    \n") for b in self.batches: @@ -162,7 +162,7 @@ class Group: %s %d - %d\n""" % (self.id, self.no, self.flags.join(), + %d\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 +294,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 != "" @@ -401,7 +401,7 @@ class Batch: 'tooltip' : cgi.escape(tooltip, True), } + link_post) - f.write("%s]\n" % builders.join()) + f.write("%s]\n" % ' '.join(builders)) def rpmbuild_opts(self): """ @@ -501,7 +501,7 @@ class Batch: %s %s %s\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)))