Merge remote-tracking branch 'refs/remotes/ansgar/pu/multiarchive-1' into merge

[dak.git] / dak / process_upload.py

diff --git a/dak/process_upload.py b/dak/process_upload.py
index 4d9f3b00b768071363bd9ac74c72cefe19de7e74..1908ecb5ed2e2310c257555be45a6cf1059d8cc5 100755 (executable)
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -188,6 +188,7 @@ Logger = None
 def usage (exit_code=0):
     print """Usage: dak process-upload [OPTION]... [CHANGES]...
   -a, --automatic           automatic run
+  -d, --directory <DIR>     process uploads in <DIR>
   -h, --help                show this help and exit.
   -n, --no-action           don't do anything
   -p, --no-lock             don't check lockfile !! for cron.daily only !!
@@ -439,8 +440,8 @@ def main():
         if not cnf.has_key("Dinstall::Options::%s" % (i)):
             cnf["Dinstall::Options::%s" % (i)] = ""
 
-    changes_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
-    Options = cnf.SubTree("Dinstall::Options")
+    changes_files = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
+    Options = cnf.subtree("Dinstall::Options")
 
     if Options["Help"]:
         usage()