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

Proposed by Michael Terry on 2016-10-11
Status: Merged
Approved by: Charles Kerr on 2016-11-15
Approved revision: 298
Merged at revision: 300
Proposed branch: lp:~mterry/indicator-power/snap-root
Merge into: lp:indicator-power
Diff against target: 9 lines (+1/-1)
1 file modified
data/indicator-power.conf.in (+1/-1)
To merge this branch: bzr merge lp:~mterry/indicator-power/snap-root
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing on 2016-10-11
Indicator Applet Developers 2016-10-11 Pending
Review via email: mp+308133@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 :

FAILED: Continuous integration, rev:298
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-power-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/862/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/869
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/675
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/675
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/675
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/675
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/675
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/675
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/675
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/675/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/675/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/675
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/675/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/indicator-power.conf.in'
--- data/indicator-power.conf.in 2014-02-20 14:56:38 +0000
+++ data/indicator-power.conf.in 2016-10-11 14:56:59 +0000
@@ -6,4 +6,4 @@
6respawn6respawn
7respawn limit 2 107respawn limit 2 10
88
9exec @pkglibexecdir@/indicator-power-service9exec $SNAP@pkglibexecdir@/indicator-power-service

Subscribers

People subscribed via source and target branches