X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fimport_known_changes.py;h=7b182d6f199123908f02b5406ea9ae580ea14c3c;hb=27e00376e81d1c37ff327ee0d39670b266418869;hp=5d666b6b6f4ef58b730cd3a33656cb829d9dd247;hpb=ab58bad73376ccc69685fcb731916ac03edadc68;p=dak.git diff --git a/dak/import_known_changes.py b/dak/import_known_changes.py index 5d666b6b..7b182d6f 100755 --- a/dak/import_known_changes.py +++ b/dak/import_known_changes.py @@ -32,7 +32,7 @@ import sys import os import logging import threading -from daklib.dbconn import DBConn, get_dbchange +from daklib.dbconn import DBConn, get_dbchange, get_policy_queue from daklib.config import Config import apt_pkg from daklib.dak_exceptions import DBUpdateError, InvalidDscError, ChangesUnicodeError @@ -209,9 +209,9 @@ class ChangesGenerator(threading.Thread): if queue: dirs.append(os.path.abspath(queue.path)) else: - utils.warn("Could not find queue %s in database" % queue_name) + warn("Could not find queue %s in database" % queue_name) - for checkdir in dirs + for checkdir in dirs: if os.path.exists(checkdir): print "Looking into %s" % (checkdir) @@ -269,7 +269,7 @@ class ImportThread(threading.Thread): changes.add_known_changes(to_import.dirpath, session=self.session) self.session.commit() - except InvalidDscError, line: + except InvalidDscError as line: warn("syntax error in .dsc file '%s', line %s." % (f, line)) except ChangesUnicodeError: @@ -298,7 +298,7 @@ class ImportKnownChanges(object): except KeyboardInterrupt: print("Caught C-c; terminating.") - utils.warn("Caught C-c; terminating.") + warn("Caught C-c; terminating.") self.plsDie() def plsDie(self):