Merge lp://qastaging/~mterry/indicator-session/snap-root into lp://qastaging/indicator-session

Proposed by Michael Terry
Status: Merged
Approved by: Charles Kerr
Approved revision: 472
Merged at revision: 478
Proposed branch: lp://qastaging/~mterry/indicator-session/snap-root
Merge into: lp://qastaging/indicator-session
Diff against target: 9 lines (+1/-1)
1 file modified
data/indicator-session.conf.in (+1/-1)
To merge this branch: bzr merge lp://qastaging/~mterry/indicator-session/snap-root
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve
Indicator Applet Developers Pending
Review via email: mp+308129@code.qastaging.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.

And I left the "/usr/share/apport/recoverable_problem" hardcoded path in src/recoverable-problem.c. That seems like more of a deb-based reporting tool anyway. And I wasn't sure there is some plan for snappy to include an error reporting tool or what.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

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

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches