From 9c95044cb8a7d86dcf8b5badbb14982492fa2d01 Mon Sep 17 00:00:00 2001 From: Goffi Date: Wed, 26 Dec 2018 17:18:52 +0100 Subject: [PATCH] plugin OTR: catch and log potr.context.ErrorReceived instead of raising it. --- sat/plugins/plugin_sec_otr.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sat/plugins/plugin_sec_otr.py b/sat/plugins/plugin_sec_otr.py index bfa6b285..2da548ae 100644 --- a/sat/plugins/plugin_sec_otr.py +++ b/sat/plugins/plugin_sec_otr.py @@ -595,6 +595,12 @@ class OTR(object): feedback = msg client.feedback(from_jid, msg) raise failure.Failure(exceptions.CancelError(msg)) + except potr.context.ErrorReceived as e: + msg = D_(u"WARNING: received OTR error message: {msg}".format(msg=e)) + log.warning(msg) + feedback = msg + client.feedback(from_jid, msg) + raise failure.Failure(exceptions.CancelError(msg)) except StopIteration: return data else: