laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35102?usp=email )

(

1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: pySim-shell: refuse to execute a startup script on initialization errors ......................................................................

pySim-shell: refuse to execute a startup script on initialization errors

When there is an error on initialization (e.g. card not present), we should not continue to execute a startup script that was passed with the pySim-shell commandline. Instead we should print a message that the startup script was ignored due to errors.

Related: OS#6271 Change-Id: I61329988e0e9021b5b0ef8e0819fb8e23cabf38b --- M pySim-shell.py 1 file changed, 18 insertions(+), 1 deletion(-)

Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified

diff --git a/pySim-shell.py b/pySim-shell.py index 795276a..4e08eb7 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -979,7 +979,9 @@ " it should also be noted that some readers may behave strangely when no card") print(" is inserted.)") print("") - app = PysimApp(None, None, sl, ch, opts.script) + if opts.script: + print("will not execute startup script due to card initialization errors!") + app = PysimApp(None, None, sl, ch)

# If the user supplies an ADM PIN at via commandline args authenticate # immediately so that the user does not have to use the shell commands