X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=c81ef8ea20fbee5dd0f8a2918a2447a4ea142c7d;hb=42b695c3cb0d5a6e830d7473441bbe09e8f09b3c;hp=ef781f19e6c24fcdad659349e6669f6d231b0596;hpb=e1156b3b857f5496a299e621d291cff0ba957d23;p=dak.git diff --git a/daklib/queue.py b/daklib/queue.py index ef781f19..c81ef8ea 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -1264,7 +1264,7 @@ class Upload(object): session.close() - return True + return (len(self.rejects) == 0) ########################################################################### @@ -2451,6 +2451,8 @@ distribution.""" if self.logger: self.logger.log(["rejected", self.pkg.changes_file]) + stats = SummaryStats() + stats.reject_count += 1 return 0 ################################################################################ @@ -2547,6 +2549,12 @@ distribution.""" # Check versions for each target suite for target_suite in self.pkg.changes["distribution"].keys(): + # Check we can find the target suite + ts = get_suite(target_suite) + if ts is None: + self.rejects.append("Cannot find target suite %s to perform version checks" % target_suite) + continue + must_be_newer_than = [ vc.reference.suite_name for vc in get_version_checks(target_suite, "MustBeNewerThan") ] must_be_older_than = [ vc.reference.suite_name for vc in get_version_checks(target_suite, "MustBeOlderThan") ]