X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=daklib%2Fchecks.py;h=c7c4a16f23f03c8b482df3f1ee07792f74008764;hb=0fe78641fc8c73a0fd40b83dba90a12d3ae1f0b5;hp=436827372c9b9d27074b722ded838a1c1ac5de92;hpb=1807bcb3ba6d31dfa058deaa6b7cbd3a3b1b6e8b;p=dak.git

diff --git a/daklib/checks.py b/daklib/checks.py
index 43682737..c7c4a16f 100644
--- a/daklib/checks.py
+++ b/daklib/checks.py
@@ -31,7 +31,7 @@ from daklib.regexes import *
 from daklib.textutils import fix_maintainer, ParseMaintError
 import daklib.lintian as lintian
 import daklib.utils as utils
-from daklib.upload import InvalidHashException
+import daklib.upload
 
 import apt_inst
 import apt_pkg
@@ -160,13 +160,11 @@ class SignatureAndHashesCheck(Check):
         try:
             for f in files:
                 f.check(upload.directory)
-        except IOError as e:
-            if e.errno == errno.ENOENT:
-                raise Reject('{0} refers to non-existing file: {1}\n'
-                             'Perhaps you need to include it in your upload?'
-                             .format(filename, os.path.basename(e.filename)))
-            raise
-        except InvalidHashException as e:
+        except daklib.upload.FileDoesNotExist as e:
+            raise Reject('{0}: {1}\n'
+                         'Perhaps you need to include the file in your upload?'
+                         .format(filename, unicode(e)))
+        except daklib.upload.UploadException as e:
             raise Reject('{0}: {1}'.format(filename, unicode(e)))
 
 class ChangesCheck(Check):