Update RPM specific packaging to match RPM naming convention #2268
Conversation
This file contains 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
fix: Update RPM specific packaging to match RPM naming convention RPM naming convention says that: 1. We should use dashes not underscores in the package filename 2. We should include a package version (iteration) in the package name This change removes the code which swapped underscores for dashes in the RPM specific code. It also moves the code which removes the package_iteration in to an else block and adds an rpm specific work around to not do that. This was done so that non-rpm builds are not affected by this change. Fixes: #95
nathanielc
reviewed
Dec 19, 2019
| @@ -772,9 +772,10 @@ def package(build_output, pkg_name, version, nightly=False, iteration=1, static= | |||
| outfile = new_outfile | |||
| else: | |||
| if package_type == 'rpm': | |||
| # rpm's convert any dashes to underscores | |||
| package_version = package_version.replace("-", "_") | |||
There was a problem hiding this comment.
hmmm this is not the solution I expected. If it works.... great, it been a while since I touched this code. I believe the reason the - are being replaced is so that what comes after the - doesn't get understood as the release part of the version.
I am likely wrong here, but testing is king.
timhallinflux
requested review from
bnpfeife
and removed request for
codyshepherd
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fix: Update RPM specific packaging to match RPM naming convention
RPM naming convention says that:
This change removes the code which swapped underscores for dashes in the RPM specific code.
It also moves the code which removes the package_iteration in to an else block and adds an rpm specific work around to not do that. This was done so that non-rpm builds are not affected by this change.
Fixes: https://github.com/influxdata/feature-requests/issues/95
Required for all non-trivial PRs