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 7298026208a82a8f231812b253a581f7c9b5d2f0..63ea10f2a8ee01d2aa8bf5c3646741bebf6ebf79 100644 (file)
--- a/daklib/checks.py
+++ b/daklib/checks.py
@@ -30,6 +30,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 apt_inst
 import apt_pkg
@@ -173,8 +174,8 @@ class HashesCheck(Check):
             for f in changes.files.itervalues():
                 f.check(upload.directory)
             source = changes.source
-            what = source.filename
             if source is not None:
+                what = source.filename
                 for f in source.files.itervalues():
                     f.check(upload.directory)
         except IOError as e:
@@ -183,6 +184,8 @@ class HashesCheck(Check):
                              '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."""