python-adfs
changeset 59:b90e29694f28
Added exception handling for unrecognised disc images and request verbose
logging when the verify option is used.
| author | David Boddie <david@boddie.org.uk> |
|---|---|
| date | Mon Jul 21 03:26:00 2003 +0200 |
| parents | 62b3240b117e |
| children | e979580ce9c6 |
| files | ADF2INF.py |
| diffstat | 1 files changed, 28 insertions(+), 7 deletions(-) [+] |
line diff
1.1 --- a/ADF2INF.py Mon Jul 21 03:24:59 2003 +0200 1.2 +++ b/ADF2INF.py Mon Jul 21 03:26:00 2003 +0200 1.3 @@ -236,13 +236,27 @@ 1.4 1.5 if listing == 0 and verify == 0: 1.6 1.7 - # Create an ADFSdisc instance using this file. 1.8 - adfsdisc = ADFSlib.ADFSdisc(adf) 1.9 + try: 1.10 + 1.11 + # Create an ADFSdisc instance using this file. 1.12 + adfsdisc = ADFSlib.ADFSdisc(adf) 1.13 + 1.14 + except ADFSlib.ADFS_exception: 1.15 + 1.16 + print "Unrecognised disc image: %s" % adf_file 1.17 + sys.exit() 1.18 1.19 elif listing != 0: 1.20 1.21 - # Create an ADFSdisc instance using this file. 1.22 - adfsdisc = ADFSlib.ADFSdisc(adf, verify = 1) 1.23 + try: 1.24 + 1.25 + # Create an ADFSdisc instance using this file. 1.26 + adfsdisc = ADFSlib.ADFSdisc(adf, verify = 1) 1.27 + 1.28 + except ADFSlib.ADFS_exception: 1.29 + 1.30 + print "Unrecognised disc image: %s" % adf_file 1.31 + sys.exit() 1.32 1.33 else: 1.34 1.35 @@ -251,10 +265,17 @@ 1.36 print "Verifying..." 1.37 print 1.38 1.39 - # Create an ADFSdisc instance using this file. 1.40 - adfsdisc = ADFSlib.ADFSdisc(adf, verify = 1) 1.41 + try: 1.42 1.43 - adfsdisc.print_log() 1.44 + # Create an ADFSdisc instance using this file. 1.45 + adfsdisc = ADFSlib.ADFSdisc(adf, verify = 1) 1.46 + 1.47 + except ADFSlib.ADFS_exception: 1.48 + 1.49 + print "Unrecognised disc image: %s" % adf_file 1.50 + sys.exit() 1.51 + 1.52 + adfsdisc.print_log(verbose = 1) 1.53 1.54 # Exit 1.55 sys.exit()