# HG changeset patch # User Goffi # Date 1545841132 -3600 # Node ID a86f494457c23766da7e8f5e0af0380eedf4f107 # Parent d0466af33483b3f509ee55edc5e549bbb2dc2ada plugin OTR: catch and log potr.context.ErrorReceived instead of raising it. diff -r d0466af33483 -r a86f494457c2 sat/plugins/plugin_sec_otr.py --- a/sat/plugins/plugin_sec_otr.py Wed Dec 26 14:37:13 2018 +0100 +++ b/sat/plugins/plugin_sec_otr.py Wed Dec 26 17:18:52 2018 +0100 @@ -595,6 +595,12 @@ 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: