RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

solaar-cli: clearer handling of invalid device numbers

This commit is contained in:
Daniel Pavel 2013-07-05 14:34:18 +02:00
parent 373b07f271
commit 87e2f1cad7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/solaar/cli.py
View File

@ -54,10 +54,11 @@ def _find_device(receiver, name, may_be_receiver=False):
except:
pass
else:
if number in range(1, 1 + receiver.max_devices):
if number < 1 or number > receiver.max_devices:
_fail("%s (%s) supports device numbers 1 to %d" % (receiver.name, receiver.path, receiver.max_devices))
dev = receiver[number]
if dev is None:
_fail("no paired device with number", number)
_fail("no paired device with number %s" % number)
return dev
if len(name) < 3: