Revert "Add generated modules in EDF appli for SALOME 6.6.0"

This reverts commit d08eec98d75fa7b2b49add7cb5f04fa3b6928570.

diff --git a/commands/application.py b/commands/application.py
index 47e562e004562757e670536e519aa844de809882..78c8e39516d129014b1b78d2a5b91027debef407 100644 (file)
--- a/commands/application.py
+++ b/commands/application.py
@@ -246,9 +246,6 @@ def get_SALOME_modules(config):
         product_info = src.product.get_product_config(config, product)
         if src.product.product_is_SALOME(product_info):
             l_modules.append(product)
-        if src.product.product_is_generated(product_info):
-            if "component_name" in product_info:
-                l_modules.append(product_info.component_name)
     return l_modules
 
 ##

diff --git a/salomeTools.py b/salomeTools.py
index d7889748bce6243bf6cc26caba8d6547dce86711..4b25cfa68fdd9ae902fd8f5ced8d13bc7c2b624b 100755 (executable)
--- a/salomeTools.py
+++ b/salomeTools.py
@@ -157,18 +157,14 @@ class Sat(object):
             (file_, pathname, description) = imp.find_module(nameCmd, [dirPath])
             module = imp.load_module(nameCmd, file_, pathname, description)
             
-            def run_command(args='',
-                            batch = False,
-                            verbose = -1,
-                            logger_add_link = None):
+            def run_command(args='', batch = False, verbose = -1, logger_add_link = None):
                 '''The function that will load the configuration (all pyconf)
                 and return the function run of the command corresponding to module
                 
                 :param args str: The directory path containing the commands 
                 '''
                 # Make sure the internationalization is available
-                gettext.install('salomeTools',
-                                os.path.join(satdir, 'src', 'i18n'))
+                gettext.install('salomeTools', os.path.join(satdir, 'src', 'i18n'))
                 
                 # Get the arguments in a list and remove the empty elements
                 argv_0 = args.split(" ")
@@ -221,9 +217,9 @@ class Sat(object):
                 if logger_add_link:
                     micro_command = True
                 logger_command = src.logger.Logger(self.cfg, 
-                                   silent_sysstd=silent,
-                                   all_in_terminal=self.options.all_in_terminal,
-                                   micro_command=micro_command)
+                                                   silent_sysstd=silent,
+                                                   all_in_terminal=self.options.all_in_terminal,
+                                                   micro_command=micro_command)
                 
                 # Check that the path given by the logs_paths_in_file option
                 # is a file path that can be written
@@ -241,9 +237,7 @@ class Sat(object):
                     except Exception as e:
                         msg = _("WARNING: the logs_paths_in_file option will "
                                 "not be taken into account.\nHere is the error:")
-                        logger_command.write("%s\n%s\n\n" % (
-                                             src.printcolors.printcWarning(msg),
-                                             str(e)))
+                        logger_command.write("%s\n%s\n\n" % (src.printcolors.printcWarning(msg), str(e)))
                         self.options.logs_paths_in_file = None
                 
                 try: