]> SALOME platform Git repositories - tools/sat.git/commitdiff
Salome HOME
bug fix with both -n and -p options are used
authorcrouzet <nicolas.crouzet@cea.fr>
Wed, 11 Dec 2019 15:07:08 +0000 (16:07 +0100)
committercrouzet <nicolas.crouzet@cea.fr>
Wed, 11 Dec 2019 15:07:08 +0000 (16:07 +0100)
commands/package.py

index f76b37bfba1d526a34abfbbb0526ed5577759df1..25cf410ab1b4c1bd573741ada6beb2cdfed8353b 100644 (file)
@@ -1520,8 +1520,7 @@ Please add it in file:
         if options.project:
             if options.sat:
                 archive_name += "_" 
-            project_name = options.project
-            archive_name += ("satproject_" + project_name)
+            archive_name += ("satproject_" + options.project)
  
         if len(archive_name)==0: # no option worked 
             msg = _("Error: Cannot name the archive\n"
@@ -1600,8 +1599,8 @@ Please add it in file:
                                   options, logger))
         
     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, options.ftp, tmp_working_dir, options.sat, logger))
+        DBG.write("config for package %s" % options.project, runner.cfg)
+        d_files_to_add.update(project_package(runner.cfg, options.project, options.project_file_path, options.ftp, tmp_working_dir, options.sat, logger))
 
     if not(d_files_to_add):
         msg = _("Error: Empty dictionnary to build the archive!\n")