Merge remote-tracking branch 'jcristau/cs-set-log-suite'

[dak.git] / dak / copy_installer.py

diff --git a/dak/copy_installer.py b/dak/copy_installer.py
index 34ae3215ef4a9834078f2f99aee697757a89b6b4..2e8a04875fdcd3c5a2a7582f52ee643aa464e5a7 100755 (executable)
--- a/dak/copy_installer.py
+++ b/dak/copy_installer.py
@@ -44,8 +44,8 @@ def main():
     for option in [ "help", "source", "destination", "no-action" ]:
         if not cnf.has_key("Copy-Installer::Options::%s" % (option)):
             cnf["Copy-Installer::Options::%s" % (option)] = ""
-    extra_arguments = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
-    Options = cnf.SubTree("Copy-Installer::Options")
+    extra_arguments = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
+    Options = cnf.subtree("Copy-Installer::Options")
 
     if Options["Help"]:
         usage()
@@ -92,7 +92,7 @@ class InstallerCopier:
 
     def check_dir(self, dir, message):
         if not os.path.isdir(dir):
-            raise IOError(message)
+            raise IOError("%s (%s)" % (message, dir))
 
     def check_architecture(self, arch_dir):
         architecture = re.sub('.*?/installer-(.*?)/.*', r'\1', arch_dir)