Unity

Merge lp:~azzar1/unity/lp-1485668 into lp:unity

  1. lp-1485668
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Rejected
Rejected by: Marco Trevisan (Treviño)
Proposed branch: lp:~azzar1/unity/lp-1485668
Merge into: lp:unity
Diff against target: 8 lines (+1/-1)
1 file modified
data/pam/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/lp-1485668
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Disapprove
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+268253@code.launchpad.net

Commit message

Install unity pam config file in /etc only if the build configuration is Release.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3988
http://jenkins.qa.ubuntu.com/job/unity-ci/1284/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/60/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1284/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ok, better than previous situation.

If pam had a pkgconfig support would have been better...

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Mh, it seems that launchpad builds unity with -DCMAKE_BUILD_TYPE=None.

So, we can either install this in all the configurations, but in Debug mode. Or update the debian/rules.

I think we can keep this for next landing.

review: Needs Fixing
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

We get this free now with the GNUInstallDirs cmake package, by using ${CMAKE_INSTALL_SYSCONFDIR}/pam.d.

Then I can reject this as it's fixed in lp:~3v1n0/unity/proper-multiarch/+merge/285426

review: Disapprove

Unmerged revisions

3988. By Andrea Azzarone <email address hidden>

Install unity pam config file in /etc only if the build configuration is Release.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/pam/CMakeLists.txt'
2--- data/pam/CMakeLists.txt 2014-06-19 15:54:27 +0000
3+++ data/pam/CMakeLists.txt 2015-08-17 16:17:16 +0000
4@@ -1,1 +1,1 @@
5-install(FILES unity DESTINATION ${CMAKE_SYSCONFDIR}/pam.d)
6\ No newline at end of file
7+install(FILES unity DESTINATION ${CMAKE_SYSCONFDIR}/pam.d CONFIGURATIONS Release)
8\ No newline at end of file