pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: We don't need the shell for pip

Browse source
This commit is contained in:
Gina Häußge 2015-06-30 18:52:23 +02:00
parent 7cd0adb922
commit 2db32289f3
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/util/pip.py
View file

@ -65,11 +65,10 @@ class PipCaller(object):
command = [self._command] + list(args) command = [self._command] + list(args)
joined_command = " ".join(command) joined_command = " ".join(command)
self._logger.debug(u"Calling: {}".format(joined_command)) self._logger.debug(u"Calling: {}".format(joined_command))
self.on_log_call(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() p.wait_events()
all_stdout = [] all_stdout = []
@ -140,8 +139,7 @@ class PipCaller(object):
if pip_command is not None: if pip_command is not None:
self._logger.debug("Found pip at {}, going to figure out its version".format(pip_command)) self._logger.debug("Found pip at {}, going to figure out its version".format(pip_command))
command = [pip_command, "--version"] p = sarge.run([pip_command, "--version"], stdout=sarge.Capture(), stderr=sarge.Capture())
p = sarge.run(" ".join(command), shell=True, stdout=sarge.Capture(), stderr=sarge.Capture())
if p.returncode != 0: if p.returncode != 0:
self._logger.warn("Error while trying to run pip --version: {}".format(p.stderr.text)) self._logger.warn("Error while trying to run pip --version: {}".format(p.stderr.text))