X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdominate.py;h=a6be1b035adc841f35fec7d83f6ac3c8e015e94b;hb=f2027f086182b71e083bab22c778fd9ed678ca33;hp=483ab28ab9e7c0f279f9fad6ac0b6ad7db5f3d6f;hpb=50db22ea5f288daa39f81138a41a509d9a41cc3e;p=dak.git

diff --git a/dak/dominate.py b/dak/dominate.py
index 483ab28a..a6be1b03 100755
--- a/dak/dominate.py
+++ b/dak/dominate.py
@@ -125,17 +125,18 @@ def main():
                  ('s', "suite",     "Obsolete::Options::Suite", "HasArg"),
                  ('n', "no-action", "Obsolete::Options::No-Action"),
                  ('f', "force",     "Obsolete::Options::Force")]
-    query_suites = DBConn().session().query(Suite)
-    suites = [suite.suite_name for suite in query_suites.all()]
-    if not cnf.has_key('Obsolete::Options::Suite'):
-        cnf['Obsolete::Options::Suite'] = ','.join(suites)
     cnf['Obsolete::Options::Help'] = ''
     cnf['Obsolete::Options::No-Action'] = ''
     cnf['Obsolete::Options::Force'] = ''
-    apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
-    Options = cnf.SubTree("Obsolete::Options")
+    apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
+    Options = cnf.subtree("Obsolete::Options")
     if Options['Help']:
         usage()
+    if 'Suite' not in Options:
+        query_suites = DBConn().session().query(Suite)
+        suites = [suite.suite_name for suite in query_suites]
+        cnf['Obsolete::Options::Suite'] = str(','.join(suites))
+
     Logger = daklog.Logger("dominate")
     session = DBConn().session()
     for suite_name in utils.split_args(Options['Suite']):
@@ -146,6 +147,7 @@ def main():
         session.rollback()
     else:
         session.commit()
+    Logger.close()
 
 if __name__ == '__main__':
     main()