Fixed another crash at startup with missing or empty settings entry i…

…nto configuration file
manatools · Apr 23, 2020 · 9c38e36 · 9c38e36
1 parent b91f08e
commit 9c38e36
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ if(POLICY CMP0048)
 	cmake_policy(SET CMP0048 NEW)
 endif(POLICY CMP0048)
 
-project(dnfdragora VERSION 2.0.1 LANGUAGES NONE)
+project(dnfdragora VERSION 2.0.2 LANGUAGES NONE)
 cmake_minimum_required(VERSION 3.4)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")

diff --git a/Changes b/Changes
@@ -1,3 +1,8 @@
+2020-04-23 v. 2.0.2
+---------------------
+- Fixed another crash at startup with missing or empty settings 
+  entry into configuration file
+
 2020-04-13 v. 2.0.1
 ---------------------
 - Fixed a crash at startup with missing settings entry into configuration file

diff --git a/dnfdragora/ui.py b/dnfdragora/ui.py
@@ -316,6 +316,8 @@ def _configFileRead(self) :
         user_settings = {}
         if self.config.userPreferences:
             if 'settings' in self.config.userPreferences.keys() :
+                if self.config.userPreferences['settings'] is None:
+                    self.config.userPreferences['settings'] = {}
                 user_settings = self.config.userPreferences['settings']
                 #### MetaData
                 if 'metadata' in user_settings.keys():
@@ -349,9 +351,6 @@ def _configFileRead(self) :
                         self.log_directory = log['directory']
                     if 'level_debug' in log.keys() :
                         self.level_debug = log['level_debug']
-        else:
-          # NOTE that should not happen since userPreferences should at least empty dictionary
-          self.config.userPreferences = {}
 
         # metadata settings is needed adding it to update old configuration files
         if not 'settings' in self.config.userPreferences.keys() :