From: Ansgar Burchardt Date: Sat, 15 Sep 2012 11:49:29 +0000 (+0200) Subject: daklib/archive.py: look for target suites earlier X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f97b838c73a074ca65e19fd9816f5de7c88e23d;p=dak daklib/archive.py: look for target suites earlier --- diff --git a/daklib/archive.py b/daklib/archive.py index a55bfaba..ef5fceb0 100644 --- a/daklib/archive.py +++ b/daklib/archive.py @@ -850,27 +850,32 @@ class ArchiveUpload(object): assert self.changes.valid_signature try: + # Validate signatures and hashes before we do any real work: for chk in ( checks.SignatureCheck, checks.ChangesCheck, - checks.TransitionCheck, - checks.UploadBlockCheck, checks.HashesCheck, checks.SourceCheck, checks.BinaryCheck, checks.BinaryTimestampCheck, - checks.ACLCheck, checks.SingleDistributionCheck, - checks.NoSourceOnlyCheck, - checks.LintianCheck, ): chk().check(self) final_suites = self._final_suites() if len(final_suites) == 0: - self.reject_reasons.append('Ended with no suite to install to.') + self.reject_reasons.append('No target suite found. Please check your target distribution and that you uploaded to the right archive.') return False + for chk in ( + checks.TransitionCheck, + checks.UploadBlockCheck, + checks.ACLCheck, + checks.NoSourceOnlyCheck, + checks.LintianCheck, + ): + chk().check(self) + for chk in ( checks.SourceFormatCheck, checks.SuiteArchitectureCheck,