From 66da377b64608f7af66bf516569233ecaa471c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 26 Aug 2016 10:19:20 +0200 Subject: [PATCH] SWU: Minor fixes in the octoprint check population --- src/octoprint/plugins/softwareupdate/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index 2fea893d..41215d03 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -762,12 +762,12 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, # downgrade on a prerelease channel change (rc/devel => rc/maintenance) result["release_compare"] = "python_unequal" - # also we compare versions fully, not just the base so that we see a difference + # we compare versions fully, not just the base so that we see a difference # between RCs + stable for the same version release result["force_base"] = False if check.get("update_script", None): - # if we are using the update_script, we also need to set our update_branch and force + # if we are using the update_script, we need to set our update_branch and force # to install the exact version we requested if check["prerelease"]: @@ -784,7 +784,7 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, else: # we are not tracking prereleases, but aren't on the stable branch either => switch back # to stable branch on update - result["update_branch"] = self._settings.get(["octoprint_stable_branch", "branch"]) + result["update_branch"] = check.get("update_branch", self._settings.get(["octoprint_stable_branch", "branch"])) else: result["displayName"] = check.get("displayName", target)