X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fchanges.py;h=fd09cb7f2086b4c96ebaeffd21da5a047ef6a31a;hb=b2cd3d45ab3962eb4a2ccbefd3882654217a184c;hp=1bca6dc15539df16dbf0b58142b79275018446d8;hpb=42ca3d8171b5e775d7424e1a3d037db935ee387a;p=dak.git diff --git a/daklib/changes.py b/daklib/changes.py index 1bca6dc1..fd09cb7f 100755 --- a/daklib/changes.py +++ b/daklib/changes.py @@ -29,7 +29,6 @@ Changes class for dak import os import stat -import time import datetime from cPickle import Unpickler, Pickler @@ -192,18 +191,18 @@ class Changes(object): def mark_missing_fields(self): """add "missing" in fields which we will require for the known_changes table""" - for key in ['urgency', 'maintainer', 'fingerprint', 'changedby' ]: + for key in ['urgency', 'maintainer', 'fingerprint', 'changed-by' ]: if (not self.changes.has_key(key)) or (not self.changes[key]): self.changes[key]='missing' - def add_known_changes(self, queue, session=None): + def add_known_changes(self, dirpath, session=None): """add "missing" in fields which we will require for the known_changes table""" cnf = Config() + privatetrans = False if session is None: session = DBConn().session() privatetrans = True - dirpath = cnf["Dir::Queue::%s" % (queue) ] changesfile = os.path.join(dirpath, self.changes_file) filetime = datetime.datetime.fromtimestamp(os.path.getctime(changesfile)) @@ -215,7 +214,7 @@ class Changes(object): distribution, urgency, maintainer, fingerprint, changedby, date) VALUES (:changesfile,:filetime,:source,:binary, :architecture, :version,:distribution,:urgency,:maintainer,:fingerprint,:changedby,:date)""", - { 'changesfile':changesfile, + { 'changesfile':self.changes_file, 'filetime':filetime, 'source':self.changes["source"], 'binary':self.changes["binary"],