From: pmikus <pmikus@cisco.com>
Date: Mon, 20 Sep 2021 12:09:24 +0000 (+0000)
Subject: FIX: Do not fail to copy directory
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=1e9808d4bbb94fcd1579a5e0377bcaacc1fa5e85;p=ci-management.git

FIX: Do not fail to copy directory

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I3cff2ca3feef7fc1083584249cdb2866e13ea836
---

diff --git a/jjb/scripts/publish_library_py.sh b/jjb/scripts/publish_library_py.sh
index a6e2edfaa..400f77e42 100644
--- a/jjb/scripts/publish_library_py.sh
+++ b/jjb/scripts/publish_library_py.sh
@@ -101,14 +101,17 @@ def copy_archives(workspace):
             raise RuntimeError(u"Not a directory.")
         else:
             logging.debug("Archives dir {} does exist.".format(archives_dir))
-            for file_or_dir in os.listdir(archives_dir):
-                f = os.path.join(archives_dir, file_or_dir)
+            for item in os.listdir(archives_dir):
+                src = os.path.join(archives_dir, item)
+                dst = os.path.join(dest_dir, item)
                 try:
-                    logging.debug(u"Copying " + f)
-                    shutil.copy(f, dest_dir)
+                    if os.path.isdir(src):
+                        shutil.copytree(src, dst, symlinks=False, ignore=None)
+                    else:
+                        shutil.copy2(src, dst)
                 except shutil.Error as e:
                     logging.error(e)
-                    raise RuntimeError(u"Could not copy " + f)
+                    raise RuntimeError(u"Could not copy " + src)
     else:
         logging.error(u"Archives dir does not exist.")
         raise RuntimeError(u"Missing directory " + archives_dir)