From 3b5c2fe51948c9b33e57a10c1479eddbf535e9b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 19 Jan 2017 12:31:53 +0100 Subject: [PATCH] SWU: Config version 4 didn't properly migrate old commands -> version 5 --- src/octoprint/plugins/softwareupdate/__init__.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index a976d954..7e21de1c 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -305,11 +305,18 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin, self._refresh_configured_checks = True def get_settings_version(self): - return 4 + return 5 def on_settings_migrate(self, target, current=None): - if current is None or current < 4: + if current == 4: + # config version 4 didn't correctly remove the old settings for octoprint_restart_command + # and environment_restart_command + + self._settings.set(["environment_restart_command"], None) + self._settings.set(["octoprint_restart_command"], None) + + if current is None or current < 5: # config version 4 and higher moves octoprint_restart_command and # environment_restart_command to the core configuration