X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fchanges.py;h=c1f8f5ba89f5168f0d322c7d82fe04b1164be17c;hb=37818276a5aba97d97763420a7655d2350dad747;hp=596b74618b85bfd9adef2579f8724b528bfd6ca7;hpb=8c6875857c86b85f14e78da51e014845e538ef26;p=dak.git diff --git a/daklib/changes.py b/daklib/changes.py old mode 100755 new mode 100644 index 596b7461..c1f8f5ba --- a/daklib/changes.py +++ b/daklib/changes.py @@ -179,7 +179,7 @@ class Changes(object): @session_wrapper def remove_known_changes(self, session=None): - session.delete(get_knownchange(self.changes_file, session)) + session.delete(get_dbchange(self.changes_file, session)) def mark_missing_fields(self): """add "missing" in fields which we will require for the known_changes table""" @@ -200,12 +200,13 @@ class Changes(object): multivalues = {} for key in ("distribution", "architecture", "binary"): if isinstance(self.changes[key], dict): - multivalues[key] = ", ".join(self.changes[key].keys()) + multivalues[key] = " ".join(self.changes[key].keys()) else: multivalues[key] = self.changes[key].keys() + # TODO: Use ORM session.execute( - """INSERT INTO known_changes + """INSERT INTO changes (changesname, seen, source, binaries, architecture, version, distribution, urgency, maintainer, fingerprint, changedby, date) VALUES (:changesfile,:filetime,:source,:binary, :architecture, @@ -223,6 +224,10 @@ class Changes(object): 'changedby': self.changes["changed-by"], 'date': self.changes["date"]} ) + session.commit() + + return session.query(DBChange).filter_by(changesname = self.changes_file).one() + def unknown_files_fields(self, name): return sorted(list( set(self.files[name].keys()) - set(CHANGESFIELDS_FILES)))