From ff249473215fe1ef0bc3cc96a8baffe88ba4cde2 Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Thu, 12 Jan 2023 09:59:23 -0500 Subject: [PATCH] configuration: fix glitch when changing versions --- lib/solaar/configuration.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/solaar/configuration.py b/lib/solaar/configuration.py index c5f804c1..a7e577ab 100644 --- a/lib/solaar/configuration.py +++ b/lib/solaar/configuration.py @@ -84,11 +84,12 @@ def _parse_config(loaded_config, config_path): loaded_version = loaded_config[0] discard_derived_properties = loaded_version != current_version if discard_derived_properties: - _log.warning( - 'config file \'%s\' was generated by another version of solaar ' - '(config: %s, current: %s). refreshing detected device capabilities', config_path, loaded_version, - current_version - ) + if _log.isEnabledFor(_INFO): + _log.info( + 'config file \'%s\' was generated by another version of solaar ' + '(config: %s, current: %s). refreshing detected device capabilities', config_path, loaded_version, + current_version + ) for device in loaded_config[1:]: assert isinstance(device, dict) @@ -112,8 +113,8 @@ def _device_entry_from_config_dict(data, discard_derived_properties): # remove any string entries (from bad conversions) data['divert-keys'] = {k: v for k, v in divert.items() if isinstance(k, int)} if discard_derived_properties: - data.pop('_absent') - data.pop('_battery') + data.pop('_absent', None) + data.pop('_battery', None) return _DeviceEntry(**data)