]> git.decadent.org.uk Git - dak.git/commitdiff
Improve wording of rejection a bit more.
authorAnsgar Burchardt <ansgar@debian.org>
Tue, 11 Jun 2013 06:12:47 +0000 (08:12 +0200)
committerAnsgar Burchardt <ansgar@debian.org>
Tue, 11 Jun 2013 06:12:47 +0000 (08:12 +0200)
Many version checks fail because the uploaded version is identical to the one
already present. Make the message correct for that case as well.

daklib/checks.py

index 0a22dde88a2d46bd9dfe8d5d1c4503578e5c326f..fc3bb22f4b9664723ae6617c41576adddb31e0c6 100644 (file)
@@ -719,7 +719,7 @@ class VersionCheck(Check):
             if v is not None and not op(version_compare(source_version, v)):
                 raise Reject("Version check failed:\n"
                              "Your upload included the source package {0}, version {1},\n"
-                             "however {3} already has the {4} version {2}.\n"
+                             "however {3} already has version {2}.\n"
                              "Uploads to {5} must have a {4} version than present in {3}."
                              .format(source_name, source_version, v, other_suite.suite_name, op_name, suite.suite_name))
 
@@ -731,7 +731,7 @@ class VersionCheck(Check):
             if v is not None and not op(version_compare(binary_version, v)):
                 raise Reject("Version check failed:\n"
                              "Your upload included the binary package {0}, version {1}, for {2},\n"
-                             "however {4} already has the {5} version {3}.\n"
+                             "however {4} already has version {3}.\n"
                              "Uploads to {6} must have a {5} version than present in {4}."
                              .format(binary_name, binary_version, architecture, v, other_suite.suite_name, op_name, suite.suite_name))