From e6fcc2cdc838d9a453538491e36bc6487cf95246 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Tue, 7 Jul 2020 07:11:28 -0400
Subject: [PATCH] bpo-41207 In distutils.spawn, rewrite FileNotFound (GH-21359)

Automerge-Triggered-By: @jaraco
(cherry picked from commit 6ae2780be0667a8dc52c4fb583171ec86067d700)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
---
 Lib/distutils/spawn.py                               | 12 +++++++++---
 Lib/distutils/tests/test_spawn.py                    |  5 +++++
 .../Library/2020-07-06-16-58-53.bpo-41207.Emw7Nk.rst |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2020-07-06-16-58-53.bpo-41207.Emw7Nk.rst

diff --git a/Lib/distutils/spawn.py b/Lib/distutils/spawn.py
index aad277b0ca7767..0d1bd0391e6f11 100644
--- a/Lib/distutils/spawn.py
+++ b/Lib/distutils/spawn.py
@@ -71,9 +71,15 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0):
             env = dict(os.environ,
                        MACOSX_DEPLOYMENT_TARGET=cur_target)
 
-    proc = subprocess.Popen(cmd, env=env)
-    proc.wait()
-    exitcode = proc.returncode
+    try:
+        proc = subprocess.Popen(cmd, env=env)
+        proc.wait()
+        exitcode = proc.returncode
+    except OSError as exc:
+        if not DEBUG:
+            cmd = cmd[0]
+        raise DistutilsExecError(
+            "command %r failed: %s" % (cmd, exc.args[-1])) from exc
 
     if exitcode:
         if not DEBUG:
diff --git a/Lib/distutils/tests/test_spawn.py b/Lib/distutils/tests/test_spawn.py
index cf1faad5f4dd5d..ad5038142faadf 100644
--- a/Lib/distutils/tests/test_spawn.py
+++ b/Lib/distutils/tests/test_spawn.py
@@ -124,6 +124,11 @@ def test_find_executable(self):
                     rv = find_executable(program)
                     self.assertEqual(rv, filename)
 
+    def test_spawn_missing_exe(self):
+        with self.assertRaises(DistutilsExecError) as ctx:
+            spawn(['does-not-exist'])
+        self.assertIn("command 'does-not-exist' failed", str(ctx.exception))
+
 
 def test_suite():
     return unittest.makeSuite(SpawnTestCase)
diff --git a/Misc/NEWS.d/next/Library/2020-07-06-16-58-53.bpo-41207.Emw7Nk.rst b/Misc/NEWS.d/next/Library/2020-07-06-16-58-53.bpo-41207.Emw7Nk.rst
new file mode 100644
index 00000000000000..db99c63f948837
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-07-06-16-58-53.bpo-41207.Emw7Nk.rst
@@ -0,0 +1 @@
+In distutils.spawn, restore expectation that DistutilsExecError is raised when the command is not found.