From eadc9ee795c60ae3dcd82cc77466b914d93dedc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 30 Jun 2015 18:52:23 +0200 Subject: [PATCH] Fix: We don't need the shell for pip (cherry picked from commit 2db3228) --- src/octoprint/util/pip.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/octoprint/util/pip.py b/src/octoprint/util/pip.py index f670edf7..7d3d1da1 100644 --- a/src/octoprint/util/pip.py +++ b/src/octoprint/util/pip.py @@ -65,11 +65,10 @@ class PipCaller(object): command = [self._command] + list(args) joined_command = " ".join(command) - self._logger.debug(u"Calling: {}".format(joined_command)) self.on_log_call(joined_command) - p = sarge.run(joined_command, shell=True, async=True, stdout=sarge.Capture(), stderr=sarge.Capture()) + p = sarge.run(command, async=True, stdout=sarge.Capture(), stderr=sarge.Capture()) p.wait_events() all_stdout = [] @@ -140,8 +139,7 @@ class PipCaller(object): if pip_command is not None: self._logger.debug("Found pip at {}, going to figure out its version".format(pip_command)) - command = [pip_command, "--version"] - p = sarge.run(" ".join(command), shell=True, stdout=sarge.Capture(), stderr=sarge.Capture()) + p = sarge.run([pip_command, "--version"], stdout=sarge.Capture(), stderr=sarge.Capture()) if p.returncode != 0: self._logger.warn("Error while trying to run pip --version: {}".format(p.stderr.text))