Fix copy broken paths

Author: dkubek

repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py

@@ -362,8 +362,9 @@ def _copy_certificates(context, target_userspace):
     # error
 
     run(['mv', target_pki, backup_pki])
-    context.copytree_from('/etc/pki', target_pki)
+    context.copytree_from('/etc/pki', target_pki, ignore_dangling_symlinks=True)
 
+    # TODO(dkubek): is rpm-gpg owned by rpm?
     for filepath in files_owned_by_rpms:
         src_path = os.path.join(backup_pki, filepath)
         dst_path = os.path.join(target_pki, filepath)
@@ -384,6 +385,8 @@ def _copy_certificates(context, target_userspace):
             continue
 
         run(['rm', '-rf', dst_path])
+        parent_dir = os.path.dirname(dst_path)
+        run(['mkdir', '-p', parent_dir])
         run(['cp', '-a', src_path, dst_path])
 
 

repos/system_upgrade/common/libraries/mounting.py

@@ -209,15 +209,15 @@ def copytree_to(self, src, dst):
         """
         shutil.copytree(src, self.full_path(dst))
 
-    def copytree_from(self, src, dst):
+    def copytree_from(self, src, dst, ignore_dangling_symlinks=False):
         """
         Recursively copy an entire directory tree rooted at src. The destination directory,
         named by dst, must not already exist; it will be created as well as missing parent directories.
 
         The destination directory is considered to be on the current system root.
         The source directory is considered to be in the isolated environment.
         """
-        shutil.copytree(self.full_path(src), dst)
+        shutil.copytree(self.full_path(src), dst, ignore_dangling_symlinks=ignore_dangling_symlinks)
 
     def copy_to(self, src, dst):
         """