From 45a14942c969ed508b35abd5e116cb18f84ce5b4 Mon Sep 17 00:00:00 2001 From: Marcin Niemira Date: Sun, 9 Jun 2019 07:05:06 +1000 Subject: bpo-11122: fix hardcoded path checking for rpmbuild in bdist_rpm.py (GH-10594) --- Lib/distutils/command/bdist_rpm.py | 5 +---- Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py index 20ca7ac..74381cc 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 0000000..4839066 --- /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. -- cgit v0.12