From 5327ff1917ee1d56d03c3d605e40bb3a29eee770 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Mon, 31 Mar 2025 10:24:01 +0200 Subject: [PATCH] fix: access to cli.config_file variable with commandline --- src/rougail/cli/__main__.py | 14 ++++++++------ src/rougail/cli/config.py | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/rougail/cli/__main__.py b/src/rougail/cli/__main__.py index 4da29af..070fdf7 100644 --- a/src/rougail/cli/__main__.py +++ b/src/rougail/cli/__main__.py @@ -48,12 +48,14 @@ def _main(): cmd_config.property.read_write() fake_rougail_config = {'step.user_data': [],} fake_user_datas = [] - if RougailUserDataYaml and Path(rougailconfig["cli.config_file"]).is_file(): - fake_rougail_config = {'step.user_data': 'yaml', - 'yaml.filename': [rougailconfig["cli.config_file"]], - 'yaml.file_with_secrets': 'all', - } - fake_user_datas.extend(RougailUserDataYaml(cmd_config, rougailconfig=fake_rougail_config).run()) + if RougailUserDataYaml: + config_file = cmd_config.forcepermissive.option("cli.config_file").value.get() + if Path(config_file).is_file(): + fake_rougail_config = {'step.user_data': 'yaml', + 'yaml.filename': [config_file], + 'yaml.file_with_secrets': 'all', + } + fake_user_datas.extend(RougailUserDataYaml(cmd_config, rougailconfig=fake_rougail_config).run()) if RougailUserDataEnvironment: fake_rougail_config = {'step.user_data': 'environment', 'environment.default_environment_name': 'ROUGAILCLI', diff --git a/src/rougail/cli/config.py b/src/rougail/cli/config.py index 84133c3..ea3dea9 100644 --- a/src/rougail/cli/config.py +++ b/src/rougail/cli/config.py @@ -28,7 +28,7 @@ cli: description: {_('Command line option')} config_file: - description: {_('display debug informations')} + description: {_('load rougail cli parameters from a file)} type: unix_filename commandline: false params: