From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 8 Jun 2019 21:25:21 +0000 (-0700)
Subject: bpo-11122: fix hardcoded path checking for rpmbuild in bdist_rpm.py (GH-10594)
X-Git-Tag: v3.8.0b2~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f7629d93c8cb3e0ee118c6a6463250f03d6c9f9;p=python

bpo-11122: fix hardcoded path checking for rpmbuild in bdist_rpm.py (GH-10594)

(cherry picked from commit 45a14942c969ed508b35abd5e116cb18f84ce5b4)

Co-authored-by: Marcin Niemira <marcin.niemira@gmail.com>
---

diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
index 20ca7ac6dc..74381cc69a 100644
--- a/Lib/distutils/command/bdist_rpm.py
+++ b/Lib/distutils/command/bdist_rpm.py
@@ -309,10 +309,7 @@ class bdist_rpm(Command):
 
         # build package
         log.info("building RPMs")
-        rpm_cmd = ['rpm']
-        if os.path.exists('/usr/bin/rpmbuild') or \
-           os.path.exists('/bin/rpmbuild'):
-            rpm_cmd = ['rpmbuild']
+        rpm_cmd = ['rpmbuild']
 
         if self.source_only: # what kind of RPMs?
             rpm_cmd.append('-bs')
diff --git a/Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst b/Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst
new file mode 100644
index 0000000000..4839066138
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst
@@ -0,0 +1 @@
+Distutils won't check for rpmbuild in specified paths only.