Skip to content

Commit

Permalink
Bug 1623197 Change fzf management check to avoid side effects r=ahal
Browse files Browse the repository at this point in the history
Differential Revision: https://phabricator.services.mozilla.com/D67830

--HG--
extra : moz-landing-system : lando
  • Loading branch information
Simon Fraser committed Mar 25, 2020
1 parent 8bdfab6 commit ba6f2af
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion tools/tryselect/selectors/fuzzy.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,10 @@ def fzf_bootstrap(update=False):
return fzf_bin

fzf_path = os.path.join(get_state_dir(), 'fzf')
if update and not os.path.isdir(fzf_path):

# Bug 1623197: We only want to run fzf's `install` if it's not in the $PATH
# Swap to os.path.commonpath when we're not on Py2
if update and not fzf_bin.startswith(fzf_path):
print("fzf installed somewhere other than {}, please update manually".format(fzf_path))
sys.exit(1)

Expand Down

0 comments on commit ba6f2af

Please sign in to comment.