laforge has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/38165?usp=email )
Change subject: pySim-prog: fix commandline parameter check for CSV mode
......................................................................
pySim-prog: fix commandline parameter check for CSV mode
The CSV mode needs one of the four additional parameters: --imsi
--iccid, --read-iccid or --read-imsi. Also this check is unrelated
to the batch mode. The CSV file parameter reading works independently
from the batch mode.
Related: SYS#4120
Change-Id: I1292afb85122ed2b7944d02ede69c928a453866f
---
M pySim-prog.py
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/pySim-prog.py b/pySim-prog.py
index cd7ac74..b6c86af 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -197,9 +197,8 @@
return options
if options.source == 'csv':
- if (options.imsi is None) and (options.batch_mode is False) and
(options.read_imsi is False) and (options.read_iccid is False):
- parser.error(
- "CSV mode needs either an IMSI, --read-imsi, --read-iccid or
batch mode")
+ if (options.imsi is None) and (options.iccid is None) and
(options.read_imsi is False) and (options.read_iccid is False):
+ parser.error("CSV mode requires one additional parameter:
--read-iccid, --read-imsi, --iccid or --imsi")
if options.read_csv is None:
parser.error("CSV mode requires a CSV input file")
elif options.source == 'cmdline':
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/38165?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I1292afb85122ed2b7944d02ede69c928a453866f
Gerrit-Change-Number: 38165
Gerrit-PatchSet: 4
Gerrit-Owner: dexter <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
