plugin OTR: catch and log potr.context.ErrorReceived instead of raising it.
This commit is contained in:
parent
3515defd64
commit
9c95044cb8
1 changed files with 6 additions and 0 deletions
|
|
@ -595,6 +595,12 @@ class OTR(object):
|
||||||
feedback = msg
|
feedback = msg
|
||||||
client.feedback(from_jid, msg)
|
client.feedback(from_jid, msg)
|
||||||
raise failure.Failure(exceptions.CancelError(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:
|
except StopIteration:
|
||||||
return data
|
return data
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue