Merge branch 'master' of git://git.debian.org/git/users/otavio/dak into small_fixes

[dak.git] / dak / control_suite.py

diff --git a/dak/control_suite.py b/dak/control_suite.py
index 63a0386b1ed0f26f14cc5033c2055defdee09e57..4b704b97b9aaf133b18e5894013e2d2cb1ddb728 100644 (file)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -43,9 +43,9 @@
 
 import pg, sys
 import apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import utils
 
 #######################################################################################
 
@@ -244,7 +244,11 @@ def main ():
         if not Cnf.has_key("Control-Suite::Options::%s" % (i)):
             Cnf["Control-Suite::Options::%s" % (i)] = ""
 
-    file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
+    try:
+        file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
+    except SystemError, e:
+        print "%s\n" % e
+        usage(1)
     Options = Cnf.SubTree("Control-Suite::Options")
 
     if Options["Help"]: