Merge lp://qastaging/~mterry/indicator-power/snap-root into lp://qastaging/indicator-power
Proposed by
Michael Terry
Status: | Merged |
---|---|
Approved by: | Charles Kerr |
Approved revision: | 298 |
Merged at revision: | 300 |
Proposed branch: | lp://qastaging/~mterry/indicator-power/snap-root |
Merge into: | lp://qastaging/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://qastaging/~mterry/indicator-power/snap-root |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
unity-api-1-bot | continuous-integration | Needs Fixing | |
Indicator Applet Developers | Pending | ||
Review via email: mp+308133@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.
To post a comment you must log in.
FAILED: Continuous integration, rev:298 /jenkins. canonical. com/unity- api-1/job/ lp-indicator- power-ci/ 2/ /jenkins. canonical. com/unity- api-1/job/ build/862/ console /jenkins. canonical. com/unity- api-1/job/ build-0- fetch/869 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 675 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 675/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 675 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 675/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 675 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 675/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 675 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 675/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 675 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 675/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 675 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 675/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 675 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 675/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 675/console /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= yakkety/ 675 /jenkins. canonical. com/unity- api-1/job/ build-2- binpkg/ arch=i386, release= yakkety/ 675/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/unity- api-1/job/ lp-indicator- power-ci/ 2/rebuild
https:/