v3.0.x buildrpm.sh no longer respects the value of rpmtopdir #6637
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
May 3, 2019 09:52
In OMPI 2.1.2, buildrpm.sh could work with a value of rpmtopdir that was set in the environment. In newer versions this is no longer true, causing such values to be ignored. This patch adds a new argument to buildrpm.sh, -R, which allows the user to specify where to build the RPMs. Signed-off-by: Michael Heinz <[email protected]> (cherry picked from commit 687a560) Conflicts: contrib/dist/linux/buildrpm.sh
Signed-off-by: Michael Heinz <[email protected]> (cherry picked from commit 8562211)
mwheinz
changed the title
jsquyres
reviewed
May 3, 2019
| if test -r $file; then | ||
| rpmtopdir=${rpmtopdir:-"`grep %_topdir $file | awk '{ print $2 }'`"} | ||
| # if the user did not specify an $rpmtopdir, check for an .rpmmacros file. | ||
| if test "$rpmtopdir" == ""; then |
There was a problem hiding this comment.
Actually, I think the use of == is wrong here. Sorry we missed it on the master PR. 😦
I think it works with Linux test, but it fails (IIRC) with BSD flavors of test.
It might be a little better to if test -z "$rpmtopdir"; then ...
There was a problem hiding this comment.
Actually, I think this is moot -- this script is for building RPMs. Which is specific to Linux -- not BSD. So the use of == is probably ok here.
I therefore retract my prior comment. 😄
jsquyres
approved these changes
May 3, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refs #6628
In OMPI 2.1.2, buildrpm.sh could work with a value of rpmtopdir that was
set in the environment. In newer versions this is no longer true,
causing such values to be ignored. This patch adds a new argument to
buildrpm.sh, -R, which allows the user to specify where to build the
RPMs.