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

SWU: Don't use display versions for "current" in github_commit configs

Browse source
This commit is contained in:
Gina Häußge 2015-08-18 16:07:07 +02:00
parent 31db13e0c3
commit 58c6abc644
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -631,15 +631,23 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin,
result = dict(check) result = dict(check)
if target == "octoprint": if target == "octoprint":
from octoprint._version import get_versions
from flask.ext.babel import gettext from flask.ext.babel import gettext
result["displayName"] = check.get("displayName", gettext("OctoPrint")) result["displayName"] = check.get("displayName", gettext("OctoPrint"))
result["displayVersion"] = check.get("displayVersion", "{octoprint_version}") result["displayVersion"] = check.get("displayVersion", "{octoprint_version}")
result["current"] = get_versions()["version"]
from octoprint._version import get_versions
versions = get_versions()
if check["type"] == "github_commit":
result["current"] = versions.get("full-revisionid", versions.get("full", "unknown"))
else:
result["current"] = versions["version"]
else: else:
result["displayName"] = check.get("displayName", target) result["displayName"] = check.get("displayName", target)
result["displayVersion"] = check.get("displayVersion", check.get("current", "unknown")) result["displayVersion"] = check.get("displayVersion", check.get("current", "unknown"))
result["current"] = check.get("current", check.get("displayVersion", None)) if check["type"] in ("github_commit"):
result["current"] = check.get("current", None)
else:
result["current"] = check.get("current", check.get("displayVersion", None))
return result return result