HashedFile: Raise FileDoesNotExist if referring to a non-existing file

[dak.git] / daklib / checks.py

diff --git a/daklib/checks.py b/daklib/checks.py
index b7931f2f6d8e60a2b893f6a304b357fe88cefd31..c7c4a16f23f03c8b482df3f1ee07792f74008764 100644 (file)
--- 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.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
 
 import apt_inst
 import apt_pkg


@@ -112,13 +112,11 @@ class SignatureAndHashesCheck(Check):
     def check_replay(self, upload):
         # Use private session as we want to remember having seen the .changes
         # in all cases.
     def check_replay(self, upload):
         # Use private session as we want to remember having seen the .changes
         # in all cases.

-        session = DBConn().session()
+        session = upload.session

         history = SignatureHistory.from_signed_file(upload.changes)
         r = history.query(session)
         if r is not None:
         history = SignatureHistory.from_signed_file(upload.changes)
         r = history.query(session)
         if r is not None:

-            raise Reject('Signature for changes file was already seen at {0}'.format(r.seen))
-        session.add(history)
-        session.commit()
+            raise Reject('Signature for changes file was already seen at {0}.\nPlease refresh the signature of the changes file if you want to upload it again.'.format(r.seen))

         return True
 
     """Check signature of changes and dsc file (if included in upload)
         return True
 
     """Check signature of changes and dsc file (if included in upload)


@@ -162,13 +160,11 @@ class SignatureAndHashesCheck(Check):
         try:
             for f in files:
                 f.check(upload.directory)
         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):
             raise Reject('{0}: {1}'.format(filename, unicode(e)))
 
 class ChangesCheck(Check):