Including: * Use argparse default value substitution by default * Print help when required options are not given * Return error insted of (implicit) success when zone file is not found
Signed-off-by: Cleber Rosa <[email protected]> --- installation_support/autotest-firewalld-add-service | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/installation_support/autotest-firewalld-add-service b/installation_support/autotest-firewalld-add-service index 4be42f6..71184ee 100755 --- a/installation_support/autotest-firewalld-add-service +++ b/installation_support/autotest-firewalld-add-service @@ -26,10 +26,11 @@ class ArgumentParser(argparse.ArgumentParser): "configuration")) self.add_argument('-z', '--zone', default=self._get_default_zone(), - help='Zone name, using default path') + help=('Zone name, using default path (defaults to ' + '"%(default)s")')) self.add_argument('-s', '--service', default='http', - help='Service name, default is "http"') + help='Service name (defaults to "%(default)s")') def _get_default_zone(self): @@ -81,7 +82,7 @@ class App(object): if not os.path.exists(src_file_path): logging.error('Could not find default zone file: %s', src_file_path) - raise SystemExit + return False src_tree = xml.etree.ElementTree.parse(src_file_path) src_root = src_tree.getroot() @@ -103,6 +104,10 @@ class App(object): def run(self): self.parsed_arguments = self.argument_parser.parse_args() + if not (self.parsed_arguments.zone and self.parsed_arguments.service): + self.argument_parser.print_help() + raise SystemExit + if not self.parsed_arguments.zone: logging.error("A zone name is a required argument") raise SystemExit -- 1.7.11.7 _______________________________________________ Autotest-kernel mailing list [email protected] https://www.redhat.com/mailman/listinfo/autotest-kernel
