daklib/checks.py: only use source.filename if source is not None

[dak.git] / daklib / checks.py

diff --git a/daklib/checks.py b/daklib/checks.py
index 92f7e12278de34a2781a27272dab6f7052196c71..63ea10f2a8ee01d2aa8bf5c3646741bebf6ebf79 100644 (file)
--- a/daklib/checks.py
+++ b/daklib/checks.py
@@ -30,10 +30,12 @@ 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 apt_inst
 import apt_pkg
 from apt_pkg import version_compare
+import errno
 import os
 import time
 import yaml
@@ -165,13 +167,25 @@ class ChangesCheck(Check):
 class HashesCheck(Check):
     """Check hashes in .changes and .dsc are valid."""
     def check(self, upload):
-        changes = upload.changes
-        for f in changes.files.itervalues():
-            f.check(upload.directory)
-            source = changes.source
-        if source is not None:
-            for f in source.files.itervalues():
+        what = None
+        try:
+            changes = upload.changes
+            what = changes.filename
+            for f in changes.files.itervalues():
                 f.check(upload.directory)
+            source = changes.source
+            if source is not None:
+                what = source.filename
+                for f in source.files.itervalues():
+                    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(what, os.path.basename(e.filename)))
+            raise
+        except InvalidHashException as e:
+            raise Reject('{0}: {1}'.format(what, unicode(e)))
 
 class ExternalHashesCheck(Check):
     """Checks hashes in .changes and .dsc against an external database."""
@@ -183,7 +197,7 @@ class ExternalHashesCheck(Check):
             return
 
         if ext_size != f.size:
-            raise RejectStupidMaintainerException(f.filename, 'size', f.size, ext_size))
+            raise RejectStupidMaintainerException(f.filename, 'size', f.size, ext_size)
 
         if ext_md5sum != f.md5sum:
             raise RejectStupidMaintainerException(f.filename, 'md5sum', f.md5sum, ext_md5sum)