X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=e745e1eb6a87b9096e4816ae8dd4e40446630810;hb=1bd2bb874e25a236215fd4367fafb8eecdc79490;hp=3cc4053861896fa5023780d5b484bab61d6eab40;hpb=37818276a5aba97d97763420a7655d2350dad747;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index 3cc40538..e745e1eb 100644 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -115,7 +115,12 @@ def open_file(filename, mode='r'): def our_raw_input(prompt=""): if prompt: - sys.stdout.write(prompt) + while 1: + try: + sys.stdout.write(prompt) + break + except IOError: + pass sys.stdout.flush() try: ret = raw_input() @@ -1339,9 +1344,9 @@ def check_signature (sig_filename, data_filename="", keyrings=None, autofetch=No if exit_status: rejects.append("gpgv failed while checking %s." % (sig_filename)) if status.strip(): - rejects.append(prefix_multi_line_string(status, " [GPG status-fd output:] "), "") + rejects.append(prefix_multi_line_string(status, " [GPG status-fd output:] ")) else: - rejects.append(prefix_multi_line_string(output, " [GPG output:] "), "") + rejects.append(prefix_multi_line_string(output, " [GPG output:] ")) return (None, rejects) # Sanity check the good stuff we expect