# Define all possible option for log command : sat log <options>
parser = src.options.Options()
parser.add_option('m', 'module', 'list2', 'modules',
- _('modules to get the sources. This option can be'
+ _('modules from which to get the sources. This option can be'
' passed several time to get the sources of several modules.'))
parser.add_option('', 'no_sample', 'boolean', 'no_sample',
_("do not get sources from sample modules."))
parser.add_option('f', 'force', 'boolean', 'force',
_("force to get the sources of the modules in development mode."))
-def prepare_for_dev(config, module_info, source_dir, force, logger, pad):
+def get_sources_for_dev(config, module_info, source_dir, force, logger, pad):
'''The method called if the module is in development mode
:param config Config: The global configuration
:rtype: boolean
'''
if not checkout and is_dev:
- return prepare_for_dev(config, module_info, source_dir, force, logger, pad)
+ return get_sources_for_dev(config,
+ module_info,
+ source_dir,
+ force,
+ logger,
+ pad)
if module_info.get_method == "git":
return get_sources_from_git(module_info, source_dir, logger, pad,
max_module_name_len = max(map(lambda l: len(l), modules[0])) + 4
# The loop on all the modules from which to get the sources
- for module in modules:
+ for module_name, module_info in modules:
# get module name, module informations and the directory where to put
# the sources
- module_name = module[0]
- module_info = module[1]
source_dir = src.Path(module_info.source_dir)
# display and log
return good_result, results
+def description():
+ '''method that is called when salomeTools is called with --help option.
+
+ :return: The text to display for the source command description.
+ :rtype: str
+ '''
+ return _("The source command gets the sources of the application modules "
+ "from cvs, git, an archive or a directory..")
+
def run(args, runner, logger):
'''method that is called when salomeTools is called with source parameter.
'''
src.check_config_has_application( runner.cfg )
# Print some informations
- logger.write(_('Preparing sources of application %s\n') %
+ logger.write(_('Getting sources of the application %s\n') %
src.printcolors.printcLabel(runner.cfg.VARS.application), 1)
src.printcolors.print_value(logger, 'out_dir',
runner.cfg.APPLICATION.out_dir, 2)
for m in modules:
if m not in runner.cfg.APPLICATION.modules:
raise src.SatException(_("Module %(module)s "
- "not defined in appplication %(application)s") %
+ "not defined in application %(application)s") %
{ 'module': m, 'application': runner.cfg.VARS.application} )
# Construct the list of tuple containing
# the modules name and their definition
modules_infos = src.module.get_modules_infos(modules, runner.cfg)
- # if the --no_sample option is invoked, supress the sample modules from
+ # if the --no_sample option is invoked, suppress the sample modules from
# the list
if options.no_sample:
- modules_infos = filter(lambda l: not src.module.module_is_sample(l[1]),
- modules_infos)
-
+
+ lmodules_sample = [m for m in modules_infos if src.module.module_is_sample(m[1])]
+
+ modules_infos = [m for m in modules_infos if m not in lmodules_sample]
+
+ if len(lmodules_sample) > 0:
+ logger.write(src.printcolors.printcWarning(_("Ignoring the following sample modules:\n")), 1)
+ for i, module in enumerate(lmodules_sample):
+ end_text = ', '
+ if i+1 == len(lmodules_sample):
+ end_text = '\n'
+
+ logger.write(module[0] + end_text, 1)
+
# Call to the function that gets all the sources
good_result, results = get_all_module_sources(runner.cfg,
modules_infos,
details = []
logger.write("\n", 2, False)
- if good_result == len(modules):
+ if good_result == len(modules_infos):
res_count = "%d / %d" % (good_result, good_result)
else:
status = src.KO_STATUS
if results[module] == 0 or results[module] is None:
details.append(module)
- result = len(modules) - good_result
+ result = len(modules_infos) - good_result
# write results
- logger.write(_("Getting sources of application:"), 1)
+ logger.write(_("Getting sources of the application:"), 1)
logger.write(" " + src.printcolors.printc(status), 1, False)
logger.write(" (%s)\n" % res_count, 1, False)