X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_upload.py;h=12e25a3352316be03144f6c12f9d1facfa1c98fb;hb=9d06c6ce1937e733531239471c582ce608daef64;hp=13474071c34600cb82d3eae1d7a1e37df857ef21;hpb=bad5ce9898488a5e20c71bd82fd6f5c660a7190c;p=dak.git diff --git a/dak/process_upload.py b/dak/process_upload.py index 13474071..12e25a33 100755 --- a/dak/process_upload.py +++ b/dak/process_upload.py @@ -207,6 +207,8 @@ def byebye(): def action(u, session): + global Logger + cnf = Config() holding = Holding() @@ -293,7 +295,7 @@ def action(u, session): u.do_reject(0, pi) elif answer == 'A': if not chg: - chg = u.pkg.add_known_changes(holding.holding_dir, session=session) + chg = u.pkg.add_known_changes(holding.holding_dir, session=session, logger=Logger) session.commit() u.accept(summary, short_summary, session) u.check_override() @@ -302,13 +304,13 @@ def action(u, session): u.remove() elif answer == 'P': if not chg: - chg = u.pkg.add_known_changes(holding.holding_dir, session=session) + chg = u.pkg.add_known_changes(holding.holding_dir, session=session, logger=Logger) package_to_queue(u, summary, short_summary, policyqueue, chg, session) session.commit() u.remove() elif answer == queuekey: if not chg: - chg = u.pkg.add_known_changes(holding.holding_dir, session=session) + chg = u.pkg.add_known_changes(holding.holding_dir, session=session, logger=Logger) QueueInfo[qu]["process"](u, summary, short_summary, chg, session) session.commit() u.remove() @@ -501,6 +503,13 @@ def main(): utils.size_type(int(summarystats.accept_bytes))) Logger.log(["total", summarystats.accept_count, summarystats.accept_bytes]) + if summarystats.reject_count: + sets = "set" + if summarystats.reject_count > 1: + sets = "sets" + print "Rejected %d package %s." % (summarystats.reject_count, sets) + Logger.log(["rejected", summarystats.reject_count]) + byebye() if not Options["No-Action"]: