Skip to content

Backport 3.6: Fix config.py --help when the current directory contains a percent character #10135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: mbedtls-3.6
Choose a base branch
from
Open

Backport 3.6: Fix config.py --help when the current directory contains a percent character #10135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be1b226
Fix `config.py --help` when $PWD contains `%`
gilles-peskine-arm Apr 16, 2025
618cd86
Simplify
gilles-peskine-arm Apr 16, 2025
25282b4
Update framework
gilles-peskine-arm Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework
Open in desktop
Submodule framework updated 1 files
+1 −1 scripts/mbedtls_framework/config_common.py
2 changes: 1 addition & 1 deletion scripts/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ def custom_parser_options(self):
self.parser.add_argument(
'--cryptofile', '-c',
help="""Crypto file to read (and modify if requested). Default: {}."""
.format(CryptoConfigFile.default_path))
.format(str(CryptoConfigFile.default_path).replace('%', '%%')))

self.add_adapter(
'baremetal', baremetal_adapter,
Expand Down
8 changes: 2 additions & 6 deletions tests/scripts/psa_collect_statuses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,10 @@ def main():
help='Run "make clean" before regenerating the log file)')
parser.add_argument('--log-file', metavar='FILE',
default=DEFAULT_STATUS_LOG_FILE,
help='Log file location (default: {})'.format(
DEFAULT_STATUS_LOG_FILE
))
help='Log file location (default: %(default)s)')
parser.add_argument('--psa-constant-names', metavar='PROGRAM',
default=DEFAULT_PSA_CONSTANT_NAMES,
help='Path to psa_constant_names (default: {})'.format(
DEFAULT_PSA_CONSTANT_NAMES
))
help='Path to psa_constant_names (default: %(default)s)')
parser.add_argument('--use-existing-log', '-e',
action='store_true',
help='Don\'t regenerate the log file if it exists')
Expand Down