From 087eb14f012ab40415eec1cbfe5a2fb7111baf28 Mon Sep 17 00:00:00 2001 From: Christian Van Wambeke Date: Fri, 26 Oct 2018 09:31:38 +0200 Subject: [PATCH] fix -h on --products and --info --- commands/check.py | 3 +-- commands/clean.py | 3 +-- commands/compile.py | 3 +-- commands/config.py | 2 +- commands/configure.py | 3 +-- commands/make.py | 3 +-- commands/makeinstall.py | 3 +-- commands/patch.py | 3 +-- commands/prepare.py | 3 +-- commands/script.py | 10 ++++------ commands/source.py | 3 +-- 11 files changed, 14 insertions(+), 25 deletions(-) diff --git a/commands/check.py b/commands/check.py index d4c78b2..a5eeadc 100644 --- a/commands/check.py +++ b/commands/check.py @@ -23,8 +23,7 @@ import src # Define all possible option for the check command : sat check parser = src.options.Options() parser.add_option('p', 'products', 'list2', 'products', - _('Optional: products to check. This option can be' - ' passed several time to check several products.')) + _('Optional: products to check. This option accepts a comma separated list.')) CHECK_PROPERTY = "has_unit_tests" diff --git a/commands/clean.py b/commands/clean.py index 3204c0f..1077297 100644 --- a/commands/clean.py +++ b/commands/clean.py @@ -31,8 +31,7 @@ except NameError: # Define all possible option for the clean command : sat clean parser = src.options.Options() parser.add_option('p', 'products', 'list2', 'products', - _('Optional: Products to clean. This option can be' - ' passed several time to clean several products.')) + _('Optional: Products to clean. This option accepts a comma separated list.')) parser.add_option('s', 'sources', 'boolean', 'sources', _("Optional: Clean the product source directories.")) parser.add_option('b', 'build', 'boolean', 'build', diff --git a/commands/compile.py b/commands/compile.py index 1a80f40..67209bb 100644 --- a/commands/compile.py +++ b/commands/compile.py @@ -32,8 +32,7 @@ except NameError: # Define all possible option for the compile command : sat compile parser = src.options.Options() parser.add_option('p', 'products', 'list2', 'products', - _('Optional: products to compile. This option can be' - ' passed several time to compile several products.')) + _('Optional: products to compile. This option accepts a comma separated list.')) parser.add_option('', 'with_fathers', 'boolean', 'fathers', _("Optional: build all necessary products to the given product (KERNEL is " "build before building GUI)."), False) diff --git a/commands/config.py b/commands/config.py index b5a3fbe..748a11b 100644 --- a/commands/config.py +++ b/commands/config.py @@ -39,7 +39,7 @@ 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('l', 'list', 'boolean', 'list', _("Optional: list all available applications.")) parser.add_option('', 'show_patchs', 'boolean', 'show_patchs', diff --git a/commands/configure.py b/commands/configure.py index 688fff0..2bf068b 100644 --- a/commands/configure.py +++ b/commands/configure.py @@ -23,8 +23,7 @@ import src # Define all possible option for configure command : sat configure parser = src.options.Options() parser.add_option('p', 'products', 'list2', 'products', - _('Optional: products to configure. This option can be' - ' passed several time to configure several products.')) + _('Optional: products to configure. This option accepts a comma separated list.')) parser.add_option('o', 'option', 'string', 'option', _('Optional: Option to add to the configure or cmake command.'), "") diff --git a/commands/make.py b/commands/make.py index 6682f81..b3e6aaf 100644 --- a/commands/make.py +++ b/commands/make.py @@ -24,8 +24,7 @@ import src # Define all possible option for the make command : sat make parser = src.options.Options() parser.add_option('p', 'products', 'list2', 'products', - _('Optional: products to configure. This option can be' - ' passed several time to configure several products.')) + _('Optional: products to configure. This option accepts a comma separated list.')) parser.add_option('o', 'option', 'string', 'option', _('Optional: Option to add to the make command.'), "") diff --git a/commands/makeinstall.py b/commands/makeinstall.py index ff13382..8a2a07a 100644 --- a/commands/makeinstall.py +++ b/commands/makeinstall.py @@ -23,8 +23,7 @@ import src # Define all possible option for the makeinstall command : sat makeinstall parser = src.options.Options() parser.add_option('p', 'products', 'list2', 'products', - _('Optional: products to install. This option can be' - ' passed several time to install several products.')) + _('Optional: products to install. This option accepts a comma separated list.')) def log_step(logger, header, step): diff --git a/commands/patch.py b/commands/patch.py index ac106df..ec43865 100644 --- a/commands/patch.py +++ b/commands/patch.py @@ -26,8 +26,7 @@ import prepare # Define all possible option for patch command : sat patch parser = src.options.Options() parser.add_option('p', 'products', 'list2', 'products', - _('Optional: products to get the sources. This option can be' - ' passed several time to get the sources of several products.')) + _('Optional: products to get the sources. This option accepts a comma separated list.')) def apply_patch(config, product_info, max_product_name_len, logger): '''The method called to apply patches on a product diff --git a/commands/prepare.py b/commands/prepare.py index cb630e5..b182a1b 100644 --- a/commands/prepare.py +++ b/commands/prepare.py @@ -27,8 +27,7 @@ import src.debug as DBG # Define all possible option for prepare command : sat prepare parser = src.options.Options() parser.add_option('p', 'products', 'list2', 'products', - _('Optional: products to prepare. This option can be' - ' passed several time to prepare several products.')) + _('Optional: products to prepare. This option accepts a comma separated list.')) parser.add_option('f', 'force', 'boolean', 'force', _("Optional: force to prepare the products in development mode.")) parser.add_option('', 'force_patch', 'boolean', 'force_patch', diff --git a/commands/script.py b/commands/script.py index bd2ee40..1593a0e 100644 --- a/commands/script.py +++ b/commands/script.py @@ -23,13 +23,11 @@ import src # Define all possible option for the script command : sat script parser = src.options.Options() parser.add_option('p', 'products', 'list2', 'products', - _('Optional: products to configure. This option can be' - ' passed several time to configure several products.')) + _('Optional: products to configure. This option accepts a comma separated list.')) parser.add_option('', 'nb_proc', 'int', 'nb_proc', - _('Optional: The number of processors to use in the script if the make ' - 'command is used in it.\n\tWarning: the script has to be correctly written ' - 'if you want this option to work.\n\tThe $MAKE_OPTIONS has to be ' - 'used.'), 0) + _("""Optional: The number of processors to use in the script if the make command is used in it. + Warning: the script has to be correctly written if you want this option to work. + The $MAKE_OPTIONS has to be used."""), 0) def log_step(logger, header, step): diff --git a/commands/source.py b/commands/source.py index ee8de55..7b2131e 100644 --- a/commands/source.py +++ b/commands/source.py @@ -27,8 +27,7 @@ import src.debug as DBG # Define all possible option for patch command : sat patch parser = src.options.Options() parser.add_option('p', 'products', 'list2', 'products', - _('Optional: products from which to get the sources. This option can be' - ' passed several time to get the sources of several products.')) + _('Optional: products from which to get the sources. This option accepts a comma separated list.')) def get_source_for_dev(config, product_info, source_dir, logger, pad): '''The method called if the product is in development mode -- 2.39.2