You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
1.2 KiB
30 lines
1.2 KiB
From a612c481f6116955d420db5ae1fe4c1eb93eb2f2 Mon Sep 17 00:00:00 2001
|
|
From: Marcin Niemira <marcin.niemira@gmail.com>
|
|
Date: Sun, 9 Jun 2019 07:05:06 +1000
|
|
Subject: [PATCH] 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>
|
|
---
|
|
Lib/distutils/command/bdist_rpm.py | 5 +----
|
|
.../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 20ca7ac6dcffa..74381cc69a6ce 100644
|
|
--- a/Lib/distutils/command/bdist_rpm.py
|
|
+++ b/Lib/distutils/command/bdist_rpm.py
|
|
@@ -309,10 +309,7 @@ def run(self):
|
|
|
|
# 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')
|
|
|