]> git.decadent.org.uk Git - dak.git/commitdiff
daklib/archive.py: look for target suites earlier
authorAnsgar Burchardt <ansgar@debian.org>
Sat, 15 Sep 2012 11:49:29 +0000 (13:49 +0200)
committerAnsgar Burchardt <ansgar@debian.org>
Sun, 16 Sep 2012 14:45:29 +0000 (16:45 +0200)
daklib/archive.py

index a55bfaba6f17aace3da4bb745691e96c937ff58c..ef5fceb0da97b16da2bcac62cb289e576888af8e 100644 (file)
@@ -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,