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

SWU: Fixed python_checker and python_updater

Browse source
This commit is contained in:
Gina Häußge 2017-01-19 14:06:33 +01:00
parent 3b5c2fe519
commit 0d76df2cd5
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/octoprint/plugins/softwareupdate/__init__.py
View file

@ -418,6 +418,15 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin,
def view():
try:
information, update_available, update_possible = self.get_current_versions(check_targets=check_targets, force=force)
# we don't want to transfer python_checker or python_updater values through json - replace with True
for key, data in information.items():
if "check" in data:
if "python_checker" in data["check"]:
data["check"]["python_checker"] = True
if "python_updater" in data["check"]:
data["check"]["python_updater"] = True
return flask.jsonify(dict(status="updatePossible" if update_available and update_possible else "updateAvailable" if update_available else "current",
information=information))
except exceptions.ConfigurationInvalid as e:
@ -932,7 +941,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin,
elif "pip" in check:
method = "pip"
elif "python_updater" in check:
method = "python_updated"
method = "python_updater"
if method is None or (valid_methods and not method in valid_methods):
raise exceptions.UnknownUpdateType()

2
src/octoprint/plugins/softwareupdate/updaters/python_updater.py
View file

@ -11,4 +11,4 @@ def can_perform_update(target, check):
def perform_update(target, check, target_version, log_cb=None):
return check["python_updater"].perform_update(target, check, target_version, log_cb=None)
return check["python_updater"].perform_update(target, check, target_version, log_cb=log_cb)