X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcopy_installer.py;h=2e8a04875fdcd3c5a2a7582f52ee643aa464e5a7;hb=17c5cab4eb8d5181ec7a81267a4e2e6b43c0fc65;hp=6bc8660174f749beafe48a147dfc6905c753aa8a;hpb=e9bf858b51a1dabbdba78c4f75c19de9f11b439b;p=dak.git

diff --git a/dak/copy_installer.py b/dak/copy_installer.py
index 6bc86601..2e8a0487 100755
--- 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)
@@ -121,7 +121,7 @@ Architectures to skip: %(skip_arch_list)s""" % {
 
     def do_copy(self):
         for source, dest in self.trees_to_copy:
-            shutil.copytree(source, dest)
+            shutil.copytree(source, dest, symlinks=True)
         for source, dest in self.symlinks_to_create:
             if os.path.lexists(dest):
                 os.unlink(dest)