From a8dfbda0d4fdc4bf90d28a7947f478075738677e Mon Sep 17 00:00:00 2001 From: Phillip Berndt Date: Thu, 1 Dec 2022 08:41:15 +0100 Subject: [PATCH] Quote arguments in failed command output See #297 and #299 --- autorandr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autorandr.py b/autorandr.py index 5541346..d9b853b 100755 --- a/autorandr.py +++ b/autorandr.py @@ -947,7 +947,7 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False) if auxiliary_changes_pre: argv = base_argv + list(chain.from_iterable(auxiliary_changes_pre)) if call_and_retry(argv, dry_run=dry_run) != 0: - raise AutorandrException("Command failed: %s" % " ".join(argv)) + raise AutorandrException("Command failed: %s" % " ".join(map(shlex.quote, argv))) # Starting here, fix the frame buffer size # Do not do this earlier, as disabling scaling might temporarily make the framebuffer @@ -985,7 +985,7 @@ def apply_configuration(new_configuration, current_configuration, dry_run=False) for index in range(0, len(operations), 2): argv = base_argv + list(chain.from_iterable(operations[index:index + 2])) if call_and_retry(argv, dry_run=dry_run) != 0: - raise AutorandrException("Command failed: %s" % " ".join(argv)) + raise AutorandrException("Command failed: %s" % " ".join(map(shlex.quote, argv))) def is_equal_configuration(source_configuration, target_configuration):