From e68ded37fe21a3a689c4a0c5fd016d43562fd7c5 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia <wavexx@thregr.org>
Date: Mon, 4 Jul 2022 12:52:34 +0200
Subject: [PATCH 1/2] tools: Do not use os.EX_DATAERR due to unavailability on
 windows

Just return a plain exit code...
---
 tools/dump2bin    | 4 ++--
 tools/elf_mem_map | 3 +--
 tools/xfimg2dump  | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/dump2bin b/tools/dump2bin
index c7ab3603b..48d7dcb3c 100755
--- a/tools/dump2bin
+++ b/tools/dump2bin
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 import argparse
-import os, sys
+import sys
 
 from lib.dump import decode_dump
 
@@ -21,7 +21,7 @@ def main():
     # decode the dump data
     dump = decode_dump(args.dump)
     if dump is None:
-        return os.EX_DATAERR
+        return 1
 
     # output descriptors
     if args.info:
diff --git a/tools/elf_mem_map b/tools/elf_mem_map
index 7e40f4f99..580ed5127 100755
--- a/tools/elf_mem_map
+++ b/tools/elf_mem_map
@@ -4,7 +4,6 @@ import elftools.elf.elffile
 import elftools.dwarf.descriptions
 from collections import namedtuple
 from struct import unpack
-import os
 import re
 
 from lib.dump import decode_dump
@@ -374,7 +373,7 @@ def main():
         # fetch the memory data
         dump = decode_dump(args.dump)
         if dump is None:
-            return os.EX_DATAERR
+            return 1
 
         # strip padding, if present
         addr_start = dump.ranges[0][0]
diff --git a/tools/xfimg2dump b/tools/xfimg2dump
index e1fe75ac5..d0cb23cb8 100755
--- a/tools/xfimg2dump
+++ b/tools/xfimg2dump
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import argparse
 import struct
-import os, sys
+import sys
 
 from lib.dump import DUMP_MAGIC, DUMP_OFFSET, DUMP_SIZE
 
@@ -25,13 +25,13 @@ def main():
         data = fd.read(DUMP_SIZE)
     if len(data) != DUMP_SIZE:
         error('incorrect image size')
-        return os.EX_DATAERR
+        return 1
 
     # check for magic header
     magic, = struct.unpack('<L', data[:4])
     if magic != DUMP_MAGIC:
         error('invalid dump magic or no dump')
-        return os.EX_DATAERR
+        return 1
 
     # output D21 dump
     print('D21 - read crash dump', end='')

From e435ef4bab956db1b203bc733265cb3eebd6849c Mon Sep 17 00:00:00 2001
From: Alex Voinea <voinea.dragos.alexandru@gmail.com>
Date: Mon, 4 Jul 2022 17:48:11 +0200
Subject: [PATCH 2/2] Fix one more EX_DATAERR after sync with 3.11.1

---
 lang/lang-check.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/lang-check.py b/lang/lang-check.py
index d91d73073..333457822 100755
--- a/lang/lang-check.py
+++ b/lang/lang-check.py
@@ -326,7 +326,7 @@ def main():
     for translation in polib.pofile(args.po):
         status &= check_translation(translation, msgids, args.pot, args.no_warning, args.no_suggest,
                                     args.warn_empty, args.warn_same, args.information)
-    return 0 if status else os.EX_DATAERR
+    return 0 if status else 1
 
 if __name__ == "__main__":
     exit(main())