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

PipCaller: Allow update of used pip command

Browse source
This commit is contained in:
Gina Häußge 2015-09-22 11:35:47 +02:00
parent 25a4d4b79b
commit c26515c13d
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,14 +21,13 @@ class PipCaller(object):
def __init__(self, configured=None):
self._logger = logging.getLogger(__name__)
self._configured = configured
self.configured = configured
self._command = None
self._version = None
self._command, self._version = self._find_pip()
self.trigger_refresh()
self.refresh = False
self.on_log_call = lambda *args, **kwargs: None
self.on_log_stdout = lambda *args, **kwargs: None
self.on_log_stderr = lambda *args, **kwargs: None
@ -57,10 +56,18 @@ class PipCaller(object):
def available(self):
return self._command is not None
def trigger_refresh(self):
try:
self._command, self._version = self._find_pip()
except:
self._logger.exception("Error while discovering pip command")
self._command = None
self._version = None
self.refresh = False
def execute(self, *args):
if self.refresh:
self._command, self._version = self._find_pip()
self.refresh = False
self.trigger_refresh()
if self._command is None:
raise UnknownPip()
@ -111,7 +118,7 @@ class PipCaller(object):
def _find_pip(self):
pip_command = self._configured
pip_command = self.configured
pip_version = None
if pip_command is None: