Merge branch 'master' of ftpmaster's dak repository

[dak.git] / dak / process_accepted.py

diff --git a/dak/process_accepted.py b/dak/process_accepted.py
index a26ce57a4226d1246871c13180eff770658dcaf6..5e09243ffa545b22f836f9e2fa57191e4cfd31d2 100755 (executable)
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@ -276,7 +276,7 @@ def install ():
 
     # 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(Upload)
+    utils.ensure_hashes(changes, dsc, files, dsc_files)
 
     # Add the .dsc file to the DB
     for file in files.keys():
@@ -353,7 +353,7 @@ def install ():
             if not files[file].has_key("location id") or not files[file]["location id"]:
                 files[file]["location id"] = database.get_location_id(Cnf["Dir::Pool"],files[file]["component"],utils.where_am_i())
             if not files[file].has_key("files id") or not files[file]["files id"]:
-                files[file]["files id"] = database.set_files_id (filename, files[file]["size"], files[file]["md5sum"], files[file]["location id"])
+                files[file]["files id"] = database.set_files_id (filename, files[file]["size"], files[file]["md5sum"], files[file]["sha1sum"], files[file]["sha256sum"], files[file]["location id"])
             source_id = database.get_source_id (source, source_version)
             if source_id:
                 projectB.query("INSERT INTO binaries (package, version, maintainer, source, architecture, file, type, sig_fpr) VALUES ('%s', '%s', %d, %d, %d, %d, '%s', %d)"