From c3d7c3fee7ab10fcc24de57d3dcfe1d6eb2bec8d Mon Sep 17 00:00:00 2001 From: Serge Rehbinder Date: Tue, 11 Oct 2016 10:48:31 +0200 Subject: [PATCH] Revert "Add generated modules in EDF appli for SALOME 6.6.0" This reverts commit d08eec98d75fa7b2b49add7cb5f04fa3b6928570. --- commands/application.py | 3 --- salomeTools.py | 18 ++++++------------ 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/commands/application.py b/commands/application.py index 47e562e..78c8e39 100644 --- 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 d788974..4b25cfa 100755 --- 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: -- 2.39.2