Merge remote-tracking branch 'nthykier/auto-decruft'

[dak.git] / dak / make_overrides.py

diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index 1d8f9c02ca7fc7a6b3fcf6636f0d72e4cffa2b94..569ee7696d831f4312ddad7e9e012b57a5232587 100755 (executable)
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -104,8 +104,8 @@ def main ():
     for i in [ "help" ]:
         if not cnf.has_key("Make-Overrides::Options::%s" % (i)):
             cnf["Make-Overrides::Options::%s" % (i)] = ""
-    apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
-    Options = cnf.SubTree("Make-Overrides::Options")
+    apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
+    Options = cnf.subtree("Make-Overrides::Options")
     if Options["Help"]:
         usage()
 
@@ -118,7 +118,7 @@ def main ():
             continue
 
         sys.stderr.write("Processing %s...\n" % (suite.suite_name))
-        override_suite = suite.overridecodename
+        override_suite = suite.overridecodename or suite.codename
 
         for component in session.query(Component).all():
             for otype in session.query(OverrideType).all():