From: Victor Stinner <vstinner@python.org>
Date: Thu, 2 Apr 2020 01:42:47 +0000 (+0200)
Subject: bpo-40094: Fix which.py script exit code (GH-19286)
X-Git-Tag: v3.9.0a6~211
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7c98f08e228e9f6e139d61e3e5d0a5018a38f0b;p=thirdparty%2FPython%2Fcpython.git

bpo-40094: Fix which.py script exit code (GH-19286)

It now uses os.waitstatus_to_exitcode() to convert os.system() exit
status into an exit code.
---

diff --git a/Misc/NEWS.d/next/Tools-Demos/2020-04-02-01-22-21.bpo-40094.1XQQF6.rst b/Misc/NEWS.d/next/Tools-Demos/2020-04-02-01-22-21.bpo-40094.1XQQF6.rst
new file mode 100644
index 000000000000..042550da8bc7
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2020-04-02-01-22-21.bpo-40094.1XQQF6.rst
@@ -0,0 +1,3 @@
+Fix ``which.py`` script exit code: it now uses
+:func:`os.waitstatus_to_exitcode` to convert :func:`os.system` exit status
+into an exit code.
diff --git a/Tools/scripts/which.py b/Tools/scripts/which.py
index df54ce032cbc..b42e07c74eca 100755
--- a/Tools/scripts/which.py
+++ b/Tools/scripts/which.py
@@ -49,6 +49,7 @@ def main():
                     msg(filename + ': not executable')
             if longlist:
                 sts = os.system('ls ' + longlist + ' ' + filename)
+                sts = os.waitstatus_to_exitcode(sts)
                 if sts: msg('"ls -l" exit status: ' + repr(sts))
         if not ident:
             msg(prog + ': not found')