From: crouzet <nicolas.crouzet@cea.fr>
Date: Thu, 22 Mar 2018 11:26:31 +0000 (+0100)
Subject: merge master
X-Git-Tag: 5.1.0~48
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e7edd607b82ef4144089a42ec29e644848355fb3;p=tools%2Fsat.git

merge master
---

e7edd607b82ef4144089a42ec29e644848355fb3
diff --cc commands/package.py
index 09fef8f,5d1ade4..1a16253
--- a/commands/package.py
+++ b/commands/package.py
@@@ -1349,7 -1337,7 +1349,6 @@@ Please add it in file
          if options.sat:
              d_files_to_add.update({"salomeTools" : (runner.cfg.VARS.salometoolsway, "")})
          
-     
 -
      if options.project:
          DBG.write("config for package %s" % project_name, runner.cfg)
          d_files_to_add.update(project_package(runner.cfg, project_name, options.project_file_path, tmp_working_dir, logger))