merge with ftp-master

[dak.git] / daklib / changes.py

diff --git a/daklib/changes.py b/daklib/changes.py
index 0fc21cb39d59b5f1326d0fdedc2be8570b4979c6..2ecd9af421752d4630c57806abe7ac3803bcb86c 100755 (executable)
--- a/daklib/changes.py
+++ b/daklib/changes.py
@@ -29,6 +29,9 @@ Changes class for dak
 
 import os
 import stat
+import time
+
+import datetime
 from cPickle import Unpickler, Pickler
 from errno import EPERM
 
@@ -36,6 +39,8 @@ from apt_inst import debExtractControl
 from apt_pkg import ParseSection
 
 from utils import open_file, fubar, poolify
+from config import *
+from dbconn import *
 
 ###############################################################################
 
@@ -178,11 +183,12 @@ class Changes(object):
             session = DBConn().session()
             privatetrans = True
 
-        session.query(KnownChange).filter(changesfile=self.changes_file).delete()
+        session.delete(get_knownchange(self.changes_file, session))
 
         if privatetrans:
             session.commit()
             session.close()
+            
     def add_known_changes(self, queue, session=None):
         cnf = Config()
 
@@ -199,7 +205,7 @@ class Changes(object):
               (changesname, seen, source, binaries, architecture, version,
               distribution, urgency, maintainer, fingerprint, changedby, date)
               VALUES (:changesfile,:filetime,:source,:binary, :architecture,
-              :version,:distribution,:urgency,'maintainer,:changedby,:date)""",
+              :version,:distribution,:urgency,:maintainer,:fingerprint,:changedby,:date)""",
               { 'changesfile':changesfile,
                 'filetime':filetime,
                 'source':self.changes["source"],