From: crouzet <nicolas.crouzet@cea.fr>
Date: Fri, 24 May 2019 12:32:22 +0000 (+0200)
Subject: handle the case where the catalog is already in place
X-Git-Tag: 5.5.0~57
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d7a8023e961d51e34aff1386b926c8ebb0f840c4;p=tools%2Fsat.git

handle the case where the catalog is already in place
---

diff --git a/commands/launcher.py b/commands/launcher.py
index 0955d95..ca293b6 100644
--- a/commands/launcher.py
+++ b/commands/launcher.py
@@ -242,7 +242,8 @@ def copy_catalog(config, catalog_path):
     out_dir = config.APPLICATION.workdir
     new_catalog_path = os.path.join(out_dir, "CatalogResources.xml")
     # Do the copy
-    shutil.copy(catalog_path, new_catalog_path)
+    if catalog_path != new_catalog_path:
+        shutil.copy(catalog_path, new_catalog_path)
     additional_environ = {'USER_CATALOG_RESOURCES_FILE' : new_catalog_path}
     return additional_environ