From: Mark Hymers Date: Sat, 8 Aug 2009 22:07:24 +0000 (+0100) Subject: misc bug fixes X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29c5916ce349344c916ba55aec6c29a216f13c02;p=dak misc bug fixes Signed-off-by: Mark Hymers --- diff --git a/dak/process_accepted.py b/dak/process_accepted.py index 317fd9fb..0626e7dc 100755 --- a/dak/process_accepted.py +++ b/dak/process_accepted.py @@ -52,6 +52,7 @@ from daklib.dak_exceptions import * from daklib.regexes import re_default_answer, re_issource, re_fdnic from daklib.urgencylog import UrgencyLog from daklib.summarystats import SummaryStats +from daklib.config import Config ############################################################################### @@ -79,7 +80,7 @@ def init(): if not cnf.has_key("Dinstall::Options::%s" % (i)): cnf["Dinstall::Options::%s" % (i)] = "" - changes_files = apt_pkg.ParseCommandLine(cnf, Arguments, sys.argv) + changes_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv) Options = cnf.SubTree("Dinstall::Options") if Options["Help"]: @@ -684,7 +685,7 @@ def main(): if not Options["No-Action"]: Logger.close() - if log_urg: + if log_urgency: UrgencyLog().close() ############################################################################### diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 67347025..7ff9a0f3 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -59,6 +59,7 @@ from daklib.dak_exceptions import * from daklib.regexes import re_default_answer from daklib.summarystats import SummaryStats from daklib.holding import Holding +from daklib.config import Config from types import * @@ -90,7 +91,7 @@ def init(): "override-distribution", "version", "directory"]: cnf["Dinstall::Options::%s" % (i)] = "" - changes_files = apt_pkg.ParseCommandLine(cnf, Arguments, sys.argv) + changes_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv) Options = cnf.SubTree("Dinstall::Options") if Options["Help"]: diff --git a/daklib/urgencylog.py b/daklib/urgencylog.py index 27c9d09b..fb2e7fab 100755 --- a/daklib/urgencylog.py +++ b/daklib/urgencylog.py @@ -26,6 +26,9 @@ Urgency Logger class for dak ############################################################################### +import os +import time + from singleton import Singleton from config import Config from utils import warn, open_file, move