X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=commands%2Fconfig.py;h=0efbfbd105de9491d6bcb87f4c38202fa29b6b09;hb=0f775353f875c7313d5f16fbffff8491943775ec;hp=a330d4630e32a7e6df0fcdd990d832d1d7a21d9a;hpb=cce7dd11f74135f2e747266c964c0089b46adfbf;p=tools%2Fsat.git diff --git a/commands/config.py b/commands/config.py index a330d46..0efbfbd 100644 --- a/commands/config.py +++ b/commands/config.py @@ -32,19 +32,23 @@ gettext.install('salomeTools', os.path.join(satdir, 'src', 'i18n')) # Define all possible option for config command : sat config parser = src.options.Options() parser.add_option('v', 'value', 'string', 'value', - _("print the value of CONFIG_VARIABLE.")) + _("Optional: print the value of CONFIG_VARIABLE.")) parser.add_option('e', 'edit', 'boolean', 'edit', - _("edit the product configuration file.")) + _("Optional: edit the product configuration file.")) parser.add_option('i', 'info', 'string', 'info', - _("get information on a product.")) + _("Optional: get information on a product.")) parser.add_option('l', 'list', 'boolean', 'list', - _("list all available applications.")) + _("Optional: list all available applications.")) +parser.add_option('', 'show_patchs', 'boolean', 'show_patchs', + _("Optional: synthetic view of all patches used in the application")) parser.add_option('c', 'copy', 'boolean', 'copy', - _("""copy a config file to the personal config files directory. + _("""Optional: copy a config file to the personal config files directory. \tWARNING the included files are not copied. \tIf a name is given the new config file takes the given name.""")) parser.add_option('n', 'no_label', 'boolean', 'no_label', - _("do not print labels, Works only with --value and --list.")) + _("Internal use: do not print labels, Works only with --value and --list.")) +parser.add_option('', 'completion', 'boolean', 'completion', + _("Internal use: print only keys, works only with --value.")) parser.add_option('s', 'schema', 'boolean', 'schema', _("Internal use.")) @@ -283,7 +287,7 @@ class ConfigManager: if not os.path.exists(project_pyconf_path): msg = _("WARNING: The project file %s cannot be found. " "It will be ignored\n" % project_pyconf_path) - sys.stdout.write(src.printcolors.printcWarning(msg)) + sys.stdout.write(msg) continue project_name = os.path.basename( project_pyconf_path)[:-len(".pyconf")] @@ -292,9 +296,11 @@ class ConfigManager: project_cfg = src.pyconf.Config(open(project_pyconf_path), PWD=("", project_pyconf_dir)) except Exception as e: - raise src.SatException(_("Error in configuration file: " - "%(file_path)s\n %(error)s") % \ - {'file_path' : project_pyconf_path, 'error': str(e) }) + msg = _("ERROR: Error in configuration file: " + "%(file_path)s\n %(error)s\n") % \ + {'file_path' : project_pyconf_path, 'error': str(e) } + sys.stdout.write(msg) + continue projects_cfg.PROJECTS.projects.addMapping(project_name, src.pyconf.Mapping(projects_cfg.PROJECTS.projects), "The %s project\n" % project_name) @@ -339,75 +345,100 @@ class ConfigManager: for rule in self.get_command_line_overrides(options, ["PATHS"]): exec('cfg.' + rule) # this cannot be factorized because of the exec - # ===================================================================== - # Load product config files in PRODUCTS section - products_cfg = src.pyconf.Config() - products_cfg.addMapping("PRODUCTS", - src.pyconf.Mapping(products_cfg), - "The products\n") - src.pyconf.streamOpener = ConfigOpener(cfg.PATHS.PRODUCTPATH) - for products_dir in cfg.PATHS.PRODUCTPATH: - # Loop on all files that are in softsDir directory - # and read their config - for fName in os.listdir(products_dir): - if fName.endswith(".pyconf"): - pName = fName[:-len(".pyconf")] - if pName in products_cfg.PRODUCTS: - continue - try: - prod_cfg = src.pyconf.Config(open( - os.path.join(products_dir, - fName)), - PWD=("", products_dir)) - except src.pyconf.ConfigError as e: - raise src.SatException(_( - "Error in configuration file: %(prod)s\n %(error)s") % \ - {'prod' : fName, 'error': str(e) }) - except IOError as error: - e = str(error) - raise src.SatException( e ); - except Exception as e: - raise src.SatException(_( - "Error in configuration file: %(prod)s\n %(error)s") % \ - {'prod' : fName, 'error': str(e) }) - - products_cfg.PRODUCTS[pName] = prod_cfg - - merger.merge(cfg, products_cfg) - - # apply overwrite from command line if needed - for rule in self.get_command_line_overrides(options, ["PRODUCTS"]): - exec('cfg.' + rule) # this cannot be factorized because of the exec - # ===================================================================== # Load APPLICATION config file if application is not None: # search APPLICATION file in all directories in configPath cp = cfg.PATHS.APPLICATIONPATH src.pyconf.streamOpener = ConfigOpener(cp) + do_merge = True try: application_cfg = src.pyconf.Config(application + '.pyconf') except IOError as e: raise src.SatException(_("%s, use 'config --list' to get the" " list of available applications.") %e) except src.pyconf.ConfigError as e: - raise src.SatException(_("Error in configuration file:" - " %(application)s.pyconf\n %(error)s") % \ - { 'application': application, 'error': str(e) } ) - - merger.merge(cfg, application_cfg) + if (not ('-e' in parser.parse_args()[1]) + or ('--edit' in parser.parse_args()[1]) + and command == 'config'): + raise src.SatException(_("Error in configuration file: " + "%(application)s.pyconf\n " + " %(error)s") % \ + { 'application': application, 'error': str(e) } ) + else: + sys.stdout.write(src.printcolors.printcWarning( + "There is an error in the file" + " %s.pyconf.\n" % cfg.VARS.application)) + do_merge = False + except Exception as e: + if (not ('-e' in parser.parse_args()[1]) + or ('--edit' in parser.parse_args()[1]) + and command == 'config'): + sys.stdout.write(src.printcolors.printcWarning("%s\n" % str(e))) + raise src.SatException(_("Error in configuration file:" + " %(application)s.pyconf\n") % \ + { 'application': application} ) + else: + sys.stdout.write(src.printcolors.printcWarning( + "There is an error in the file" + " %s.pyconf. Opening the file with the" + " default viewer\n" % cfg.VARS.application)) + sys.stdout.write("The error:" + " %s\n" % src.printcolors.printcWarning( + str(e))) + do_merge = False + + else: + cfg['open_application'] = 'yes' + # ===================================================================== + # Load product config files in PRODUCTS section + products_cfg = src.pyconf.Config() + products_cfg.addMapping("PRODUCTS", + src.pyconf.Mapping(products_cfg), + "The products\n") + if application is not None: + src.pyconf.streamOpener = ConfigOpener(cfg.PATHS.PRODUCTPATH) + for product_name in application_cfg.APPLICATION.products.keys(): + # Loop on all files that are in softsDir directory + # and read their config + product_file_name = product_name + ".pyconf" + product_file_path = src.find_file_in_lpath(product_file_name, cfg.PATHS.PRODUCTPATH) + if product_file_path: + products_dir = os.path.dirname(product_file_path) + try: + prod_cfg = src.pyconf.Config(open( + os.path.join(products_dir, + product_file_name)), + PWD=("", products_dir)) + products_cfg.PRODUCTS[product_name] = prod_cfg + except Exception as e: + msg = _( + "WARNING: Error in configuration file" + ": %(prod)s\n %(error)s" % \ + {'prod' : product_name, 'error': str(e) }) + sys.stdout.write(msg) + + merger.merge(cfg, products_cfg) + # apply overwrite from command line if needed - for rule in self.get_command_line_overrides(options, - ["APPLICATION"]): - # this cannot be factorized because of the exec - exec('cfg.' + rule) - - # default launcher name ('salome') - if ('profile' in cfg.APPLICATION and - 'launcher_name' not in cfg.APPLICATION.profile): - cfg.APPLICATION.profile.launcher_name = 'salome' - + for rule in self.get_command_line_overrides(options, ["PRODUCTS"]): + exec('cfg.' + rule) # this cannot be factorized because of the exec + + if do_merge: + merger.merge(cfg, application_cfg) + + # default launcher name ('salome') + if ('profile' in cfg.APPLICATION and + 'launcher_name' not in cfg.APPLICATION.profile): + cfg.APPLICATION.profile.launcher_name = 'salome' + + # apply overwrite from command line if needed + for rule in self.get_command_line_overrides(options, + ["APPLICATION"]): + # this cannot be factorized because of the exec + exec('cfg.' + rule) + # ===================================================================== # load USER config self.set_user_config_file(cfg) @@ -661,7 +692,27 @@ def show_product_info(config, name, logger): zz.set_python_libdirs() zz.set_a_product(name, logger) +def show_patchs(config, logger): + '''Prints all the used patchs in the application. + :param config Config: the global configuration. + :param logger Logger: The logger instance to use for the display + ''' + len_max = max([len(p) for p in config.APPLICATION.products]) + 2 + for product in config.APPLICATION.products: + product_info = src.product.get_product_config(config, product) + if src.product.product_has_patches(product_info): + logger.write("%s: " % product, 1) + logger.write(src.printcolors.printcInfo( + " " * (len_max - len(product) -2) + + "%s\n" % product_info.patches[0]), + 1) + if len(product_info.patches) > 1: + for patch in product_info.patches[1:]: + logger.write(src.printcolors.printcInfo(len_max*" " + + "%s\n" % patch), 1) + logger.write("\n", 1) + def print_value(config, path, show_label, logger, level=0, show_full_path=False): '''Prints a value from the configuration. Prints recursively the values under the initial path. @@ -763,7 +814,8 @@ def description(): :rtype: str ''' return _("The config command allows manipulation " - "and operation on config files.") + "and operation on config files.\n\nexample:\nsat config " + "SALOME-master --info ParaView") def run(args, runner, logger): @@ -790,7 +842,8 @@ def run(args, runner, logger): # case : edit user pyconf file or application file elif options.edit: editor = runner.cfg.USER.editor - if 'APPLICATION' not in runner.cfg: # edit user pyconf + if ('APPLICATION' not in runner.cfg and + 'open_application' not in runner.cfg): # edit user pyconf usercfg = os.path.join(runner.cfg.VARS.personalDir, 'salomeTools.pyconf') logger.write(_("Openning %s\n" % usercfg), 3) @@ -890,5 +943,18 @@ def run(args, runner, logger): logger.write("%s\n" % appliname) logger.write("\n") + # case : give a synthetic view of all patches used in the application + elif options.show_patchs: + src.check_config_has_application(runner.cfg) + # Print some informations + logger.write(_('Show the patchs of application %s\n') % + src.printcolors.printcLabel(runner.cfg.VARS.application), 3) + logger.write("\n", 2, False) + show_patchs(runner.cfg, logger) + + # case: print all the products name of the application (internal use for completion) + elif options.completion: + for product_name in runner.cfg.APPLICATION.products.keys(): + logger.write("%s\n" % product_name) + - \ No newline at end of file