pySim-shell: verify_adm: turn error messages into exceptions

When verify_adm is used with scripts, especially bulk provisioning, then
an exception is far more visible and allows us to spot problems with ADM
verification quicker.

Change-Id: I4162b43754efd061b6b9058b7ff8e1fc985e3538
Related: SYS#5617
This commit is contained in:
Philipp Maier
2021-09-22 16:35:55 +02:00
parent 48e1b90eb8
commit f0241451d3

View File

@@ -310,13 +310,12 @@ class PySimCommands(CommandSet):
if pin_adm:
self._cmd.poutput("found ADM-PIN '%s' for ICCID '%s'" % (result, self._cmd.iccid))
else:
self._cmd.poutput("cannot find ADM-PIN for ICCID '%s'" % (self._cmd.iccid))
return
raise ValueError("cannot find ADM-PIN for ICCID '%s'" % (self._cmd.iccid))
if pin_adm:
self._cmd.card.verify_adm(h2b(pin_adm))
else:
self._cmd.poutput("error: cannot authenticate, no adm-pin!")
raise ValueError("error: cannot authenticate, no adm-pin!")
@with_default_category('ISO7816 Commands')
class Iso7816Commands(CommandSet):