X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dak%2Fprocess_upload.py;h=1518d262ad78bc42f221a1630f90804f5578ee1a;hb=677e507613f0c410ffaefda67413ad82c2ed454c;hp=0f89f46b8765c0be4a65eb55b791b95a0995b980;hpb=e69060c1cca5a08ee5ae4ad7232a9eb51d3d09c5;p=dak.git diff --git a/dak/process_upload.py b/dak/process_upload.py index 0f89f46b..1518d262 100755 --- a/dak/process_upload.py +++ b/dak/process_upload.py @@ -243,7 +243,7 @@ def get_processed_upload(upload): pu.changes = open(upload.changes.path, 'r').read() pu.changes_filename = upload.changes.filename - pu.sourceful = upload.changes.source is not None + pu.sourceful = upload.changes.sourceful pu.source = control.get('Source') pu.version = control.get('Version') pu.architecture = control.get('Architecture') @@ -251,6 +251,8 @@ def get_processed_upload(upload): pu.program = "process-upload" + pu.warnings = upload.warnings + return pu @try_or_reject @@ -258,6 +260,7 @@ def accept(directory, upload): cnf = Config() Logger.log(['ACCEPT', upload.changes.filename]) + print "ACCEPT" upload.install() @@ -297,6 +300,7 @@ def accept_to_new(directory, upload): cnf = Config() Logger.log(['ACCEPT-TO-NEW', upload.changes.filename]) + print "ACCEPT-TO-NEW" upload.install_to_new() # TODO: tag bugs pending @@ -316,6 +320,7 @@ def real_reject(directory, upload, reason=None, notify=True): cnf = Config() Logger.log(['REJECT', upload.changes.filename]) + print "REJECT" fs = upload.transaction.fs rejectdir = cnf['Dir::Reject'] @@ -380,6 +385,9 @@ def action(directory, upload): print print "\n".join(package_info) print + if len(upload.warnings) > 0: + print "\n".join(upload.warnings) + print if len(upload.reject_reasons) > 0: print "Reason:"