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

SWU: Ignore empty or None configs

Browse source
This commit is contained in:
Gina Häußge 2017-02-14 15:03:20 +01:00
parent 189c842881
commit b2229ae24a
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,7 +113,10 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin,
deletables = []
self._clean_settings_check(key, yaml_config, default_config, delete=deletables, save=False)
effective_configs[key] = effective_config
if effective_config:
effective_configs[key] = effective_config
else:
self._logger.warn("Update for {} is empty or None, ignoring it".format(key))
# finally set all our internal representations to our processed results
for key, config in effective_configs.items():
@ -392,6 +395,10 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin,
self._settings.set(["checks", "octoprint"], None, defaults=dummy_defaults)
def _clean_settings_check(self, key, data, defaults, delete=None, save=True):
if not data:
# nothing to do
return data
if delete is None:
delete = []
@ -550,6 +557,9 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin,
if not target in check_targets:
continue
if not check:
continue
try:
populated_check = self._populated_check(target, check)
target_information, target_update_available, target_update_possible = self._get_current_version(target, populated_check, force=force)