Skip to content

Commit 65e19f6

Browse files
authored
Merge pull request prusa3d#3530 from wavexx/py_no_ex_dataerr
tools: Do not use os.EX_DATAERR due to unavailability on windows
2 parents 0e7f2b3 + e435ef4 commit 65e19f6

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

lang/lang-check.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ def main():
326326
for translation in polib.pofile(args.po):
327327
status &= check_translation(translation, msgids, args.pot, args.no_warning, args.no_suggest,
328328
args.warn_empty, args.warn_same, args.information)
329-
return 0 if status else os.EX_DATAERR
329+
return 0 if status else 1
330330

331331
if __name__ == "__main__":
332332
exit(main())

tools/dump2bin

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22
import argparse
3-
import os, sys
3+
import sys
44

55
from lib.dump import decode_dump
66

@@ -21,7 +21,7 @@ def main():
2121
# decode the dump data
2222
dump = decode_dump(args.dump)
2323
if dump is None:
24-
return os.EX_DATAERR
24+
return 1
2525

2626
# output descriptors
2727
if args.info:

tools/elf_mem_map

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import elftools.elf.elffile
44
import elftools.dwarf.descriptions
55
from collections import namedtuple
66
from struct import unpack
7-
import os
87
import re
98

109
from lib.dump import decode_dump
@@ -374,7 +373,7 @@ def main():
374373
# fetch the memory data
375374
dump = decode_dump(args.dump)
376375
if dump is None:
377-
return os.EX_DATAERR
376+
return 1
378377

379378
# strip padding, if present
380379
addr_start = dump.ranges[0][0]

tools/xfimg2dump

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python3
22
import argparse
33
import struct
4-
import os, sys
4+
import sys
55

66
from lib.dump import DUMP_MAGIC, DUMP_OFFSET, DUMP_SIZE
77

@@ -25,13 +25,13 @@ def main():
2525
data = fd.read(DUMP_SIZE)
2626
if len(data) != DUMP_SIZE:
2727
error('incorrect image size')
28-
return os.EX_DATAERR
28+
return 1
2929

3030
# check for magic header
3131
magic, = struct.unpack('<L', data[:4])
3232
if magic != DUMP_MAGIC:
3333
error('invalid dump magic or no dump')
34-
return os.EX_DATAERR
34+
return 1
3535

3636
# output D21 dump
3737
print('D21 - read crash dump', end='')

0 commit comments

Comments
 (0)