X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_new.py;h=e3388d25597654893125d0b55ee957621706c4e2;hb=99e3b06215dedeacb454182de89a4e91519b1792;hp=98ad2bd3c05e0aa217f63b50d421aa2d834c9e0b;hpb=cc095d57450c4828e855608c398cc7695283a277;p=dak.git diff --git a/dak/process_new.py b/dak/process_new.py index 98ad2bd3..e3388d25 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -680,14 +680,7 @@ def do_new(): prompt += "Edit overrides, Check, Manual reject, Note edit, Prod, [S]kip, Quit ?" while prompt.find(answer) == -1: - try: - answer = utils.our_raw_input(prompt) - except IOError, e: - if e.errno == errno.EPIPE: - utils.warn("[process_new] Caught EPIPE; skipping.") - pass - else: - raise + answer = utils.our_raw_input(prompt) m = re_default_answer.search(prompt) if answer == "": answer = m.group(1) @@ -939,6 +932,10 @@ def do_accept_stableupdate(suite, q): # pretty soon. print "Binary-only upload, source in new." move_to_holding(suite, queue_dir) + elif is_source_in_queue_dir(Cnf["Dir::Queue::Newstage"]): + # It's in newstage. Accept into the holding area + print "Binary-only upload, source in newstage." + move_to_holding(suite, queue_dir) else: # No case applicable. Bail out. Return will cause the upload # to be skipped.