X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_accepted.py;h=1e3997eb99d743d497dc304596303365a6c531cb;hb=60b5dcd3ef84f26959c514cb7730e1d1a1e4e4f8;hp=5e09243ffa545b22f836f9e2fa57191e4cfd31d2;hpb=b5d21dfae245e479a1dfd261b7f1a9d9bf2e9b99;p=dak.git

diff --git a/dak/process_accepted.py b/dak/process_accepted.py
index 5e09243f..1e3997eb 100755
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@ -274,9 +274,13 @@ def install ():
     # Begin a transaction; if we bomb out anywhere between here and the COMMIT WORK below, the DB will not be changed.
     projectB.query("BEGIN WORK")
 
-    # Check the hashes are all present: HACK: Can go away once all dak files
-    # are known to be newer than the shasum changes
-    utils.ensure_hashes(changes, dsc, files, dsc_files)
+    # Ensure that we have all the hashes we need below.
+    rejmsg = utils.ensure_hashes(changes, dsc, files, dsc_files)
+    if len(rejmsg) > 0:
+        # There were errors.  Print them and SKIP the changes.
+        for msg in rejmsg:
+            utils.warn(msg)
+        return
 
     # Add the .dsc file to the DB
     for file in files.keys():