X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_overrides.py;h=f9258d524e5e5416d997f2760773f495a8b5e4e1;hb=98d086ddda3772fb58c1bfa97478e8044596b569;hp=0c5947e36e823ac33ff46ff3364246deea02c79b;hpb=437918326e406bdb7019f8d7ce159668734a82b5;p=dak.git diff --git a/dak/control_overrides.py b/dak/control_overrides.py index 0c5947e3..f9258d52 100755 --- a/dak/control_overrides.py +++ b/dak/control_overrides.py @@ -138,7 +138,7 @@ def process_file(file, suite, component, otype, mode, action, session): if line == "": continue - maintainer_override = "" + maintainer_override = None if otype == "dsc": split_line = line.split(None, 2) if len(split_line) == 2: @@ -320,7 +320,7 @@ def main (): if not cnf.has_key("Control-Overrides::Options::Type"): cnf["Control-Overrides::Options::Type"] = "deb" - file_list = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv) + file_list = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv) if cnf["Control-Overrides::Options::Help"]: usage() @@ -353,7 +353,7 @@ def main (): utils.warn("In No-Action Mode") action = False - Logger = daklog.Logger(cnf.Cnf, "control-overrides", mode) + Logger = daklog.Logger("control-overrides", mode) if file_list: for f in file_list: process_file(utils.open_file(f), suite, component, otype, mode, action, session)