From be9c394b6383de35cabcde4c4ab4933d66231063 Mon Sep 17 00:00:00 2001 From: Olli Suutari Date: Tue, 4 Oct 2016 16:27:41 +0300 Subject: [PATCH] - For jenkins --- openlp/core/lib/db.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py index 858dbcc06..11c52c156 100644 --- a/openlp/core/lib/db.py +++ b/openlp/core/lib/db.py @@ -84,12 +84,15 @@ def handle_db_error(self, plugin_name, db_file_name): :param db_file_name: File name of database :return: None """ - db_path = get_db_path(plugin_name, db_file_name) - log.exception('Error loading database: {db}'.format(db=db_path)) - critical_error_message_box(translate('OpenLP.Manager', 'Database Error'), - translate('OpenLP.Manager', - 'OpenLP cannot load your database.\n\nDatabase: {db}').format(db=db_path)) - + try: + db_path = get_db_path(plugin_name, db_file_name) + log.exception('Error loading database: {db}'.format(db=db_path)) + critical_error_message_box(translate('OpenLP.Manager', 'Database Error'), + translate('OpenLP.Manager', + 'OpenLP cannot load your database.\n\nDatabase: {db}').format(db=db_path)) + except TypeError or FileNotFoundError: + log.exception('Failed to find data folder path.') + return def init_url(plugin_name, db_file_name=None): """