X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Ffile_sender.py;h=18ee8d8da4425c2ae6ec11b1a97f280ad932640a;hb=d398d662985299e8548fda37f75fc8b0ffe7a10f;hp=d60b59ecbbe3bca3022a4055c6a41af85cbbdc0f;hpb=b7bf1e2b6deab33a0a91bbeb14f3dddf701707ba;p=tld-builder.git diff --git a/TLD_Builder/file_sender.py b/TLD_Builder/file_sender.py index d60b59e..18ee8d8 100644 --- a/TLD_Builder/file_sender.py +++ b/TLD_Builder/file_sender.py @@ -17,6 +17,7 @@ import log import loop import status import lock +import util retries_times = [5 * 60, 5 * 60, 10 * 60, 10 * 60, 30 * 60, 60 * 60] @@ -168,7 +169,7 @@ def flush_queue(dir): return cmp(x['Type'], y['Type']) else: return rc - q.sort(mycmp) + q.sort(key=util.cmp_to_key(mycmp)) error = None # copy of q @@ -197,7 +198,7 @@ def flush_queue(dir): emails[d['Requester']] = 1 e = emails.keys() m = mailer.Message() - m.set_headers(to = e.join(", "), + m.set_headers(to = ", ".join(e), subject = "[%s] builder queue problem" % config.builder) m.write("there were problems sending files from queue %s:\n" % dir) m.write("problems:\n")