From 37bb5e7785672c575109adbc8f361e9296921f01 Mon Sep 17 00:00:00 2001 From: Daniel Mach Date: Wed, 7 Dec 2022 15:57:16 +0100 Subject: [PATCH] Handle empty EDITOR=/PAGER= env variable properly --- osc/core.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/osc/core.py b/osc/core.py index 847c37a3..2e532efe 100644 --- a/osc/core.py +++ b/osc/core.py @@ -4197,7 +4197,8 @@ def run_pager(message, tmp_suffix=''): else: tmpfile.write(message) tmpfile.flush() - pager = os.getenv('PAGER', default=get_default_pager()) + pager = os.getenv("PAGER", default="").strip() + pager = pager or get_default_pager() cmd = shlex.split(pager) + [tmpfile.name] try: run_external(*cmd) @@ -4212,7 +4213,8 @@ def run_editor(filename): def _editor_command(): - editor = os.getenv('EDITOR', default=get_default_editor()) + editor = os.getenv("EDITOR", default="").strip() + editor = editor or get_default_editor() try: cmd = shlex.split(editor) except SyntaxError: