Merge lp:~mterry/indicator-printers/snap-root into lp:indicator-printers

Proposed by Michael Terry on 2016-10-11
Status: Merged
Approved by: dobey on 2016-11-30
Approved revision: 75
Merged at revision: 79
Proposed branch: lp:~mterry/indicator-printers/snap-root
Merge into: lp:indicator-printers
Diff against target: 9 lines (+1/-1)
1 file modified
data/indicator-printers.conf.in (+1/-1)
To merge this branch: bzr merge lp:~mterry/indicator-printers/snap-root
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve on 2016-11-08
Indicator Applet Developers 2016-10-11 Pending
Review via email: mp+308130@code.launchpad.net

Commit message

Work inside a snap by prefixing hard coded paths with $SNAP.

Description of the change

There are also two hardcoded paths in the data/*.desktop.in files. But that's a static desktop file, so $SNAP isn't appropriate.

I'm not sure what the best solution for those is, but presumably it would lie in whichever component consumes the desktop file, not this package.

To post a comment you must log in.
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:75
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1027
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1034
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/825
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/825
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/825
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/825
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/825
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/825
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/825
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/825
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/825/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/825
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/825/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/2/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/indicator-printers.conf.in'
2--- data/indicator-printers.conf.in 2014-02-20 16:59:28 +0000
3+++ data/indicator-printers.conf.in 2016-10-11 14:37:27 +0000
4@@ -9,4 +9,4 @@
5 respawn
6 respawn limit 2 10
7
8-exec @pkglibexecdir@/indicator-printers-service
9+exec $SNAP@pkglibexecdir@/indicator-printers-service

Subscribers

People subscribed via source and target branches