From: Ansgar Burchardt <ansgar@debian.org>
Date: Sat, 29 Dec 2012 10:11:23 +0000 (+0100)
Subject: daklib/upload.py: more verbose message for hash mismatches
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=1aaa31abc190aba714ee84c97927696274f8b2c0

daklib/upload.py: more verbose message for hash mismatches

Reported-by: Laszlo Kajan <lkajan@rostlab.org>
---

diff --git a/daklib/upload.py b/daklib/upload.py
index 02da698a..a6f1e4b8 100644
--- a/daklib/upload.py
+++ b/daklib/upload.py
@@ -45,7 +45,13 @@ class InvalidHashException(Exception):
         self.expected = expected
         self.actual = actual
     def __str__(self):
-        return "Invalid {0} hash for {1}: expected {2}, but got {3}.".format(self.hash_name, self.filename, self.expected, self.actual)
+        return ("Invalid {0} hash for {1}:\n"
+                "According to the control file the {0} hash should be {2},\n"
+                "but {1} has {3}.\n"
+                "\n"
+                "If you did not include {1} in you upload, a different version\n"
+                "might already be known to the archive software.") \
+                .format(self.hash_name, self.filename, self.expected, self.actual)
 
 class InvalidFilenameException(Exception):
     def __init__(self, filename):