commit: fb45df369b4be7061fc14f5eb361c4d6c97e3f02
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 01:21:04 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 01:21:17 2023 +0000
URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=fb45df36
bin/merge-driver-ekeyword: mangle exit code correctly
Fixes: 263e3d64adac1ee2968233e151d1ee590532f42d
Signed-off-by: Sam James <sam <AT> gentoo.org>
bin/merge-driver-ekeyword | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/bin/merge-driver-ekeyword b/bin/merge-driver-ekeyword
index e59e10c..0235a98 100755
--- a/bin/merge-driver-ekeyword
+++ b/bin/merge-driver-ekeyword
@@ -1,6 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
#
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 or later
"""
@@ -127,8 +127,10 @@ def main(argv: Sequence[str]) -> int:
sys.exit(result)
else:
result = os.system(f"git merge-file -L HEAD -L base -L ours {A} {O}
{B}")
+ result = os.waitstatus_to_exitcode(result)
+ if result < 0 or result >= 128:
+ sys.exit(-1)
sys.exit(result)
-
if __name__ == "__main__":
main(sys.argv)
