Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update RPM specific packaging to match RPM naming convention #2268

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

8none1
Copy link

@8none1 8none1 commented Dec 19, 2019

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: https://github.com/influxdata/feature-requests/issues/95

Required for all non-trivial PRs
  • Rebased/mergable
  • Tests pass
  • CHANGELOG.md updated
  • Sign CLA (if not already signed)

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
@@ -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("-", "_")
Copy link
Contributor

@nathanielc nathanielc Dec 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@codyshepherd codyshepherd self-requested a review August 3, 2021 19:49
@timhallinflux timhallinflux requested review from bnpfeife and removed request for codyshepherd February 16, 2022 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants