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

Fix duplicate RPM scriptlet override #825

Merged
merged 3 commits into from
Jun 24, 2016
Merged

Conversation

fsat
Copy link
Collaborator

@fsat fsat commented Jun 24, 2016

Fix incorrect logic when detecting processed RPM scriptlets override file.

Includes cherry-picked test from #819.

Fixes #812.

@fsat
Copy link
Collaborator Author

fsat commented Jun 24, 2016

@muuki88 - can I have a PR review when you have the chance please?

@fsat
Copy link
Collaborator Author

fsat commented Jun 24, 2016

If this PR is merged, we should close #819 since it's cherry-picked into this PR.

@fsat fsat force-pushed the rpm-dup-scriplets branch from 5741702 to 196e0dd Compare June 24, 2016 09:05
@fsat fsat force-pushed the rpm-dup-scriplets branch from 196e0dd to ed9aacd Compare June 24, 2016 09:06
@muuki88 muuki88 added the rpm label Jun 24, 2016
@muuki88 muuki88 merged commit 54fb9aa into sbt:master Jun 24, 2016
@muuki88
Copy link
Contributor

muuki88 commented Jun 24, 2016

Perfect. Will release immediately. :)

@fsat
Copy link
Collaborator Author

fsat commented Jun 24, 2016

Thanks @muuki88 :-)

zoosky pushed a commit to zoosky/sbt-native-packager that referenced this pull request Jun 28, 2016
muuki88 pushed a commit that referenced this pull request Jul 2, 2016
* add unique test for maintainer scripts

* merge duplicate fix

* Fix duplicate RPM scriptlet override (#825)

* set verstion to 1.1.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants