From e69c4c6b4f503d5c6024559e2640557288119be1 Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Sat, 20 Jun 2020 20:41:33 -0400 Subject: [PATCH] receiver: don't abort on unexpected device number, just warn --- lib/solaar/listener.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/solaar/listener.py b/lib/solaar/listener.py index a240e4de..7d38f70a 100644 --- a/lib/solaar/listener.py +++ b/lib/solaar/listener.py @@ -20,7 +20,7 @@ from __future__ import absolute_import, division, print_function, unicode_literals import time -from logging import getLogger, INFO as _INFO +from logging import getLogger, INFO as _INFO, WARNING as _WARNING _log = getLogger(__name__) del getLogger @@ -182,7 +182,10 @@ class ReceiverListener(_listener.EventsListener): return # a device notification - assert 0 < n.devnumber <= self.receiver.max_devices + if not(0 < n.devnumber <= self.receiver.max_devices): + if _log.isEnabledFor(_WARNING): + _log.warning(_("Unexpected device number (%s) in notification %s." % (n.devnumber, n))) + return already_known = n.devnumber in self.receiver # FIXME: hacky fix for kernel/hardware race condition