oe: pass gcc and tmux commands as lists
PATCH 1/1 oe: pass gcc and tmux commands as lists
Avoid shell=True in subprocess calls.
Handle OSError if gcc cannot be started.
Signed-off-by Anders Heimer <[email protected]>
--- meta/lib/oe/terminal.py | 4 ++-- meta/lib/oe/utils.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-)
meta/lib/oe/terminal.py +2 -2
@@ -283,8 +283,8 @@ def check_tmux_pane_size(tmux): if not check_tmux_version('1.9'): return False try: - p = sub.Popen('%s list-panes -F "#{?pane_active,#{pane_height},}"' % tmux, - shell=True,stdout=sub.PIPE,stderr=sub.PIPE) + p = sub.Popen([tmux, "list-panes", "-F", "#{?pane_active,#{pane_height},}"], + stdout=sub.PIPE, stderr=sub.PIPE) out, err = p.communicate() size = int(out.strip()) except OSError as exc:
meta/lib/oe/utils.py +4 -2
@@ -433,10 +433,12 @@ def get_host_gcc_version(d, taskcontextonly=False): # datastore PATH does not contain session PATH as set by environment-setup-... # this breaks the install-buildtools use-case # env["PATH"] = d.getVar("PATH") - output = subprocess.check_output("gcc --version", \ - shell=True, env=env, stderr=subprocess.STDOUT).decode("utf-8") + output = subprocess.check_output(["gcc", "--version"], \ + env=env, stderr=subprocess.STDOUT).decode("utf-8") except subprocess.CalledProcessError as e: bb.fatal("Error running gcc --version: %s" % (e.output.decode("utf-8"))) + except OSError as e: + bb.fatal("Error running gcc --version: %s" % e) match = re.match(r".* (\d+\.\d+)\.\d+.*", output.split('\n')[0]) if not match: