fill in the changes files tables when moving to a queue

[dak.git] / dak / process_upload.py

diff --git a/dak/process_upload.py b/dak/process_upload.py
index ec7fbd35a19a70e05be39d803516bc0fccf6ca1d..ab9a3197ddc199ebe34a1eed5d5e24b6897ce9ae 100755 (executable)
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -286,18 +286,21 @@ def action(u, session):
             chg = u.pkg.add_known_changes(holding.holding_dir, session=session)
         u.accept(summary, short_summary, session)
         u.check_override()
+        chg.clean_from_queue()
         session.commit()
         u.remove()
     elif answer == 'P':
         if not chg:
             chg = u.pkg.add_known_changes(holding.holding_dir, session=session)
         package_to_queue(u, summary, short_summary, policyqueue, chg, session)
+        chg.upload_into_db(u, holding.holding_dir)
         session.commit()
         u.remove()
     elif answer == queuekey:
         if not chg:
             chg = u.pkg.add_known_changes(holding.holding_dir, session=session)
         QueueInfo[qu]["process"](u, summary, short_summary, chg, session)
+        chg.upload_into_db(u, holding.holding_dir)
         session.commit()
         u.remove()
     elif answer == 'Q':
@@ -482,6 +485,11 @@ def main():
         Logger.log(["total", summarystats.accept_count, summarystats.accept_bytes])
 
     if not Options["No-Action"]:
+        # Clean out the queue files
+        session = DBConn().session()
+        session.execute("DELETE FROM changes_pending_files WHERE id NOT IN (SELECT file_id FROM changes_pending_files_map )")
+        session.commit()
+
         if log_urgency:
             UrgencyLog().close()
     Logger.close()