Merge remote-tracking branch 'dktrkranz/fixes'

[dak.git] / dak / copy_installer.py

diff --git a/dak/copy_installer.py b/dak/copy_installer.py
index 6bc8660174f749beafe48a147dfc6905c753aa8a..c70b048dfe22bc9d8c24a76a747a9230df5f556e 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()
@@ -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)