diff options
| author | Marcin Niemira <marcin.niemira@gmail.com> | 2019-06-09 07:05:06 +1000 |
|---|---|---|
| committer | Cheryl Sabella <cheryl.sabella@gmail.com> | 2019-06-08 17:05:05 -0400 |
| commit | 45a14942c969ed508b35abd5e116cb18f84ce5b4 (patch) | |
| tree | 497854838d7a8f9c2bc6d8da06095ccb53a603ec | |
| parent | e119b3d136bd94d880bce4b382096f6de3f38062 (diff) | |
| download | cpython-git-45a14942c969ed508b35abd5e116cb18f84ce5b4.tar.gz | |
bpo-11122: fix hardcoded path checking for rpmbuild in bdist_rpm.py (GH-10594)
| -rw-r--r-- | Lib/distutils/command/bdist_rpm.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst | 1 |
2 files changed, 2 insertions, 4 deletions
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. |