mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 22:56:15 +01:00
Code

Merge pull request #1202 from dmach/fix-empty-EDITOR-PAGER

Browse Source 
Handle empty EDITOR=/PAGER= env variable properly
This commit is contained in:
Daniel Mach 2022-12-07 16:13:39 +01:00 committed by GitHub
commit 53c6846c40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osc/core.py
View File

@ -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: