X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=8a3e49d10d62489a8b968259b0892e40ab29c666;hb=c167da7716976d943d9eece5aca235931b043cb4;hp=0645dd9f86d9fd45e633326c1626a8855aac46d8;hpb=3a044cf559c390a0a4dc0658ec565b6a327f136a;p=dak.git diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 0645dd9f..8a3e49d1 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -102,7 +102,7 @@ def init(): ################################################################################ def usage (exit_code=0): - print """Usage: dinstall [OPTION]... [CHANGES]... + print """Usage: dak process-unchecked [OPTION]... [CHANGES]... -a, --automatic automatic run -h, --help show this help and exit. -n, --no-action don't do anything @@ -191,10 +191,12 @@ def action(u): os.chdir(u.pkg.directory) u.do_reject(0, pi) elif answer == 'A': + u.pkg.add_known_changes( "Accepted" ) u.accept(summary, short_summary) u.check_override() u.remove() elif answer == queuekey: + u.pkg.add_known_changes( qu ) queue_info[qu]["process"](u, summary, short_summary) u.remove() elif answer == 'Q': @@ -235,7 +237,7 @@ def package_to_queue(u, summary, short_summary, queue, perms=0660, build=True, a u.pkg.write_dot_dak(dir) u.move_to_dir(dir, perms=perms) if build: - get_queue(queue.lower()).autobuild_upload(u.pkg, dir) + get_or_set_queue(queue.lower()).autobuild_upload(u.pkg, dir) # Check for override disparities u.check_override() @@ -455,7 +457,7 @@ def process_it(changes_file): u.pkg.changes["changedby2047"] = cnf["Dinstall::MyEmailAddress"] # debian-{devel-,}-changes@lists.debian.org toggles writes access based on this header - bcc = "X-DAK: dak process-unchecked\nX-Katie: $Revision: 1.65 $" + bcc = "X-DAK: dak process-unchecked" if cnf.has_key("Dinstall::Bcc"): u.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"]) else: @@ -497,9 +499,9 @@ def process_it(changes_file): u.check_distributions() u.check_files(not Options["No-Action"]) valid_dsc_p = u.check_dsc(not Options["No-Action"]) - if valid_dsc_p: + if valid_dsc_p and not Options["No-Action"]: u.check_source() - # u.check_lintian() + u.check_lintian() u.check_hashes() u.check_urgency() u.check_timestamps() @@ -507,7 +509,7 @@ def process_it(changes_file): action(u) - except SystemExit: + except (SystemExit, KeyboardInterrupt): raise except: