changeset f36fd235b49d in /home/hg/repos/gajim

author: Linus Heckemann <g...@sphalerite.org>
branches: 
details:http://hg.gajim.org/gajim?cmd=changeset;node=f36fd235b49d
description: Allow startup even with malformed plugin manifests

diffstat:

 src/plugins/pluginmanager.py |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r bbb2c16e481d -r f36fd235b49d src/plugins/pluginmanager.py
--- a/src/plugins/pluginmanager.py      Mon Oct 10 20:54:15 2016 +0200
+++ b/src/plugins/pluginmanager.py      Tue Oct 11 09:51:31 2016 +0100
@@ -447,9 +447,14 @@
 
             # read metadata from manifest.ini
             conf.remove_section('info')
-            conf_file = open(manifest_path, encoding='utf-8')
-            conf.read_file(conf_file)
-            conf_file.close()
+            with open(manifest_path, encoding='utf-8') as conf_file:
+                try:
+                    conf.read_file(conf_file)
+                except configparser.Error:
+                    log.warning(("Plugin {plugin} not loaded, error loading"
+                                 " manifest").format(plugin=elem_name)
+                                , exc_info=True)
+                    continue
 
             min_v = conf.get('info', 'min_gajim_version', fallback=None)
             max_v = conf.get('info', 'max_gajim_version', fallback=None)
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to