From c3130a8a52b9cf29190eb33c3bd4d91ba49403e1 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 8 Mar 2019 13:01:58 +0000 Subject: [PATCH] gn build: Unbreak finding a working `gn` on $PATH on Unix after r355645 From the Python subprocess docs: If shell is True, it is recommended to pass args as a string rather than as a sequence. [...] If args is a sequence, the first item specifies the command string, and any additional items will be treated as additional arguments to the shell itself. Prior to this change, the `--version` would be passed to the shell, not to a potential gn binary on $PATH, and running `gn` without any arguments makes it exit with an exit code != 0, so the script would think that there wasn't a working gn binary on $PATH. Fix this by following the documentation's recommendation of using a string now that we pass shell=True. I tested this on macOS and Windows, each with the three cases of - no gn on PATH (should run gn downloaded by get.py if present, else suggest running get.py) - broken gn wrapper on PATH (should behave like the previous item) - working gn on PATH (should use gn on PATH) llvm-svn: 355694 --- llvm/utils/gn/gn.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/utils/gn/gn.py b/llvm/utils/gn/gn.py index 62cbaa9..a6408ec 100755 --- a/llvm/utils/gn/gn.py +++ b/llvm/utils/gn/gn.py @@ -38,9 +38,9 @@ def print_no_gn(mention_get): def main(): # Find real gn executable. gn = 'gn' - if subprocess.call([gn, '--version'], stdout=open(os.devnull, 'w'), - stderr=subprocess.STDOUT, - shell=True) != 0: + if subprocess.call('gn --version', stdout=open(os.devnull, 'w'), + stderr=subprocess.STDOUT, + shell=True) != 0: # Not on path. See if get.py downloaded a prebuilt binary and run that # if it's there, or suggest to run get.py if it isn't. platform = get_platform() -- 2.7.4