From 5aa537fb21083ac84fe7bc3bf3ff7e834b5a3add Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Mon, 13 Aug 2012 21:08:58 +0000 Subject: [PATCH] process-new: examine binary packages with new overrides only Signed-off-by: Luca Falavigna --- dak/process_new.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dak/process_new.py b/dak/process_new.py index a934c91a..8d4cd6bb 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -309,10 +309,13 @@ def edit_overrides (new, upload, session): ################################################################################ -def check_pkg (upload, upload_copy): +def check_pkg (upload, upload_copy, session): + missing = [] save_stdout = sys.stdout changes = os.path.join(upload_copy.directory, upload.changes.changesname) suite_name = upload.target_suite.suite_name + handler = PolicyQueueUploadHandler(upload, session) + missing = [(m['type'], m["package"]) for m in handler.missing_overrides(hints=missing)] try: sys.stdout = os.popen("less -R -", 'w', 0) print examine_package.display_changes(suite_name, changes) @@ -324,7 +327,11 @@ def check_pkg (upload, upload_copy): for binary in upload.binaries: binary_file = os.path.join(upload_copy.directory, os.path.basename(binary.poolfile.filename)) - print examine_package.check_deb(suite_name, binary_file) + examined = examine_package.check_deb(suite_name, binary_file) + # We always need to call check_deb to display package relations for every binary, + # but we print its output only if new overrides are being added. + if ("deb", binary.package) in missing: + print examined print examine_package.output_package_relations() except IOError as e: @@ -520,7 +527,7 @@ def do_new(upload, upload_copy, handler, session): print "Hello? Operator! Give me the number for 911!" print "Dinstall in the locked area, cant process packages, come back later" elif answer == 'C': - check_pkg(upload, upload_copy) + check_pkg(upload, upload_copy, session) elif answer == 'E' and not Options["Trainee"]: missing = edit_overrides (missing, upload, session) elif answer == 'M' and not Options["Trainee"]: -- 2.39.5