Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 04:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

completion generator: Protect against undefined variable

Browse source 
Proc wasn't defined if $MANPATH was used.

Fixes #3808.
This commit is contained in:
Fabian Homborg 2017-02-03 18:18:39 +01:00
parent 94b71353ef
commit b3d5fb71f4
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
share/tools/create_manpage_completions.py
View file

@ -857,6 +857,7 @@ def parse_and_output_man_pages(paths, output_directory, show_progress):
def get_paths_from_manpath(): def get_paths_from_manpath():
# Return all the paths to man(1) and man(8) files in the manpath # Return all the paths to man(1) and man(8) files in the manpath
import subprocess, os import subprocess, os
proc = None
# $MANPATH takes precedence, just like with `man` on the CLI. # $MANPATH takes precedence, just like with `man` on the CLI.
if os.getenv("MANPATH"): if os.getenv("MANPATH"):
parent_paths = os.getenv("MANPATH").strip().split(':') parent_paths = os.getenv("MANPATH").strip().split(':')
@ -871,7 +872,7 @@ def get_paths_from_manpath():
break # Command exists, use it. break # Command exists, use it.
manpath, err_data = proc.communicate() manpath, err_data = proc.communicate()
parent_paths = manpath.decode().strip().split(':') parent_paths = manpath.decode().strip().split(':')
if not parent_paths or proc.returncode > 0: if (not parent_paths) or (proc and proc.returncode > 0):
# HACK: Use some fallback in case we can't get anything else. # HACK: Use some fallback in case we can't get anything else.
# `mandoc` does not provide `manpath` or `man --path` and $MANPATH might not be set, so just use the default for mandoc (minus /usr/X11R6/man, because that's not relevant). # `mandoc` does not provide `manpath` or `man --path` and $MANPATH might not be set, so just use the default for mandoc (minus /usr/X11R6/man, because that's not relevant).
# The alternative is reading its config file (/etc/man.conf) # The alternative is reading its config file (/etc/man.conf)