syscontainers: print only existing files, not directories

and normalize the path before printing it. Signed-off-by: Giuseppe Scrivano <[email protected]> Closes: #1131 Approved by: ashcrow
projectatomic · Nov 27, 2017 · 614a347 · 614a347
1 parent 0ce66a0
commit 614a347
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Atomic/rpm_host_install.py b/Atomic/rpm_host_install.py
@@ -90,7 +90,8 @@ def rm_add_files_to_host(old_installed_files_checksum, exports, prefix="/", file
                         dest_path = os.path.join(prefix or "/", os.path.relpath(rel_dest_path, "/"))
 
                     if os.path.exists(dest_path):
-                        util.write_out("File %s already exists." % dest_path, lf="\n")
+                        if os.path.isfile(dest_path):
+                            util.write_out("File %s already exists" % os.path.normpath(dest_path), lf="\n")
                         continue
 
                     if not os.path.exists(os.path.dirname(dest_path)):