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 warnings from rpm lint #547

Merged
merged 3 commits into from
Apr 6, 2015
Merged

Conversation

dwhjames
Copy link
Contributor

@dwhjames dwhjames commented Apr 6, 2015

  • fix warning from start script about lockfile name
  • don’t mark SystemV init script as %config

- fix warning from start script about [lockfile name](https://github.com/matwey/rpmlint/blob/67aec2b86e24d67b0674f4a0a17ac9f9c76ba736/InitScriptCheck.py#L256)
- don’t mark SystemV init script as `%config`
@muuki88 muuki88 added the rpm label Apr 6, 2015
@@ -38,7 +38,7 @@

exec="${{chdir}}/bin/${{exec}}"
prog="${{app_name}}"
lockfile=/var/lock/subsys/$prog
lockfile="/var/lock/subsys/${{app_name}}"
Copy link
Contributor

Choose a reason for hiding this comment

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

Interessting. This leads to the rpmlint error, because rpm doesn't substitute the variables?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, if it detects $… then it issues a warning as it can’t resolve the substitution. Otherwise, it’s an error.

@muuki88
Copy link
Contributor

muuki88 commented Apr 6, 2015

There's a failing test. The test is here

from commit 7e8d703, script is no longer marked `%config`
@@ -25,7 +25,7 @@ TaskKey[Unit]("check-spec-file") <<= (target, streams) map { (target, out) =>
val spec = IO.read(target / "rpm" / "SPECS" / "rpm-package.spec")
out.log.success(spec)
assert(spec contains "%attr(0644,root,root) /usr/share/rpm-package/lib/rpm-test.rpm-test-0.1.0.jar", "Wrong installation path\n" + spec)
assert(spec contains "%config %attr(0755,root,root) /etc/init.d/rpm-package", "Wrong /etc/init.d path\n" + spec)
assert(spec contains "%attr(0755,root,root) /etc/init.d/rpm-package", "Wrong /etc/init.d path\n" + spec)
Copy link
Contributor

Choose a reason for hiding this comment

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

nice. that should do it

 from commit 7e8d703, script is no longer marked `%config`
@muuki88
Copy link
Contributor

muuki88 commented Apr 6, 2015

Ahhh... same error in rpm/test-executableScriptName

muuki88 added a commit that referenced this pull request Apr 6, 2015
@muuki88 muuki88 merged commit 9a9621e into sbt:master Apr 6, 2015
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.

2 participants