begin fix sat test

[tools/sat.git] / commands / config.py

diff --git a/commands/config.py b/commands/config.py
index b5a3fbe76bc538cdc2e4437ce37b21aaf1337698..21f861eaff430a9143e05a6d3489188b431ad55e 100644 (file)
--- a/commands/config.py
+++ b/commands/config.py
@@ -17,11 +17,12 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
 import os
+import sys
 import platform
 import datetime
 import shutil
 import gettext
-import sys
+import pprint as PP
 
 import src
 import src.debug as DBG
@@ -39,7 +40,9 @@ parser.add_option('g', 'debug', 'string', 'debug',
 parser.add_option('e', 'edit', 'boolean', 'edit',
     _("Optional: edit the product configuration file."))
 parser.add_option('i', 'info', 'list2', 'info',
-    _("Optional: get information on a product."))
+    _("Optional: get information on product(s). This option accepts a comma separated list."))
+parser.add_option('p', 'products', 'list2', 'products',
+    _("Optional: same as --info, for convenience."))
 parser.add_option('l', 'list', 'boolean', 'list',
     _("Optional: list all available applications."))
 parser.add_option('', 'show_patchs', 'boolean', 'show_patchs',
@@ -221,8 +224,9 @@ class ConfigManager:
         
         # =====================================================================
         # create VARS section
-        var = self._create_vars(application=application, command=command, 
-                                datadir=datadir)
+        var = self._create_vars(application=application, command=command, datadir=datadir)
+        print("create_vars:\n%s" % PP.pformat(var))
+
         # add VARS to config
         cfg.VARS = src.pyconf.Mapping(cfg)
         for variable in var:
@@ -889,6 +893,9 @@ def description():
 def run(args, runner, logger):
     '''method that is called when salomeTools is called with config parameter.
     '''
+    import src.architecture as ARCH
+    print("get_infosys %s " % PP.pformat(ARCH.get_infosys()))
+
     # Parse the options
     (options, args) = parser.parse_args(args)
 
@@ -943,6 +950,11 @@ def run(args, runner, logger):
                     break
     
     # case : give information about the product(s) in parameter
+    if options.products:
+      if options.info is not None:
+        logger.warning('options.products %s overrides options.info %s' % (options.products, options.info))
+      options.info = options.products
+
     if options.info:
       # DBG.write("products", sorted(runner.cfg.APPLICATION.products.keys()), True)
       src.check_config_has_application(runner.cfg)