msodumper 1d64ca83 : catch exceptions in xls-dump to avoid system reports
This commit is contained in:
parent
a3c5c07b22
commit
083a7dfcc1
@ -7,6 +7,7 @@
|
|||||||
from builtins import range
|
from builtins import range
|
||||||
import sys, os.path, optparse
|
import sys, os.path, optparse
|
||||||
sys.path.append(sys.path[0]+"/msodump.zip")
|
sys.path.append(sys.path[0]+"/msodump.zip")
|
||||||
|
import traceback
|
||||||
|
|
||||||
from msodumper import ole, xlsstream, globals, node, xlsmodel, olestream
|
from msodumper import ole, xlsstream, globals, node, xlsmodel, olestream
|
||||||
from msodumper import xlsparser, msocrypto
|
from msodumper import xlsparser, msocrypto
|
||||||
@ -232,7 +233,15 @@ def main ():
|
|||||||
elif options.dump_mode == 'xml':
|
elif options.dump_mode == 'xml':
|
||||||
dumper.dumpXML()
|
dumper.dumpXML()
|
||||||
elif options.dump_mode == 'canonical-xml' or options.dump_mode == 'cxml':
|
elif options.dump_mode == 'canonical-xml' or options.dump_mode == 'cxml':
|
||||||
dumper.dumpCanonicalXML()
|
try:
|
||||||
|
dumper.dumpCanonicalXML()
|
||||||
|
except Exception as err:
|
||||||
|
if globals.params.catchExceptions:
|
||||||
|
traceback.print_exc()
|
||||||
|
else:
|
||||||
|
raise
|
||||||
|
globals.error("Dump failed")
|
||||||
|
sys.exit(1)
|
||||||
else:
|
else:
|
||||||
error("unknown dump mode: '%s'\n"%options.dump_mode)
|
error("unknown dump mode: '%s'\n"%options.dump_mode)
|
||||||
parser.print_help()
|
parser.print_help()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user