Salome HOME
projects
/
tools
/
sat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2d16ccd
)
handle the case where the catalog is already in place
author
crouzet
<nicolas.crouzet@cea.fr>
Fri, 24 May 2019 12:32:22 +0000
(14:32 +0200)
committer
crouzet
<nicolas.crouzet@cea.fr>
Fri, 24 May 2019 12:32:22 +0000
(14:32 +0200)
commands/launcher.py
patch
|
blob
|
history
diff --git
a/commands/launcher.py
b/commands/launcher.py
index 0955d9544683c52d5afb8d304f3181d7ae3ccbfc..ca293b66fd8c63b6504ca627aca0abc7471ef064 100644
(file)
--- 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