From f0241451d339000fd9608f52cd7c5951c9dfe6c1 Mon Sep 17 00:00:00 2001 From: Philipp Maier Date: Wed, 22 Sep 2021 16:35:55 +0200 Subject: [PATCH] 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 --- pySim-shell.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pySim-shell.py b/pySim-shell.py index 06e14f63..6699c6f3 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -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):