[S] Change in pysim[master]: pySim-shell: do not pass failed card object to PysimApp
dexter has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/34691?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: do not pass failed card object to PysimApp
..
pySim-shell: do not pass failed card object to PysimApp
When the try block in which we also call init_card() fails, there may be
no card object, so we must not pass the card object to PysimApp in the
except block. This is also no problem, PysimApp will run without the
card object until the user executes do_equip for a second attempt.
Related: OS#6210
Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6
---
M pySim-shell.py
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, approved
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
diff --git a/pySim-shell.py b/pySim-shell.py
index 3b6945c..79b4d8b 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -1040,7 +1040,7 @@
" it should also be noted that some readers may behave strangely
when no card")
print(" is inserted.)")
print("")
-app = PysimApp(card, None, sl, ch, opts.script)
+app = PysimApp(None, None, sl, ch, opts.script)
# 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
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/34691?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6
Gerrit-Change-Number: 34691
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in pysim[master]: pySim-shell: do not pass failed card object to PysimApp
Attention is currently required from: dexter. Hello Jenkins Builder, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/34691?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: pySim-shell: do not pass failed card object to PysimApp .. pySim-shell: do not pass failed card object to PysimApp When the try block in which we also call init_card() fails, there may be no card object, so we must not pass the card object to PysimApp in the except block. This is also no problem, PysimApp will run without the card object until the user executes do_equip for a second attempt. Related: OS#6210 Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6 --- M pySim-shell.py 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/91/34691/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34691?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6 Gerrit-Change-Number: 34691 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in pysim[master]: pySim-shell: do not pass failed card object to PysimApp
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34691?usp=email ) Change subject: pySim-shell: do not pass failed card object to PysimApp .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34691?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6 Gerrit-Change-Number: 34691 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 20:12:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: do not pass failed card object to PysimApp
Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34691?usp=email ) Change subject: pySim-shell: do not pass failed card object to PysimApp .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34691?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6 Gerrit-Change-Number: 34691 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 14:53:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: do not pass failed card object to PysimApp
Attention is currently required from: dexter, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34691?usp=email ) Change subject: pySim-shell: do not pass failed card object to PysimApp .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34691?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6 Gerrit-Change-Number: 34691 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 14:05:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: do not pass failed card object to PysimApp
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/34691?usp=email )
Change subject: pySim-shell: do not pass failed card object to PysimApp
..
pySim-shell: do not pass failed card object to PysimApp
When the try block in which we also call init_card() fails, there may be
no card object, so we must not pass the card object to PysimApp in the
except block. This is also no problem, PysimApp will run without the
card object until the user executes do_equip for a second attempt.
Related: OS#6210
Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6
---
M pySim-shell.py
1 file changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/91/34691/1
diff --git a/pySim-shell.py b/pySim-shell.py
index 3b6945c..79b4d8b 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -1040,7 +1040,7 @@
" it should also be noted that some readers may behave strangely
when no card")
print(" is inserted.)")
print("")
-app = PysimApp(card, None, sl, ch, opts.script)
+app = PysimApp(None, None, sl, ch, opts.script)
# 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
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/34691?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6
Gerrit-Change-Number: 34691
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
