Merge lp:~mterry/indicator-datetime/snap-root into lp:indicator-datetime
| Status: | Merged |
|---|---|
| Approved by: | Charles Kerr |
| Approved revision: | 463 |
| Merged at revision: | 471 |
| Proposed branch: | lp:~mterry/indicator-datetime/snap-root |
| Merge into: | lp:indicator-datetime |
| Diff against target: |
9 lines (+1/-1) 1 file modified
data/indicator-datetime.conf.in (+1/-1) |
| To merge this branch: | bzr merge lp:~mterry/indicator-datetime/snap-root |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lukáš Tinkl (community) | Needs Information | ||
| unity-api-1-bot | continuous-integration | Needs Fixing | |
|
Review via email:
|
|||
Commit message
Run inside a snap by prefixing hard coded paths with $SNAP.
Description of the change
There are many other instances of hardcoded paths in the code. This is just a drive-by fixing of the upstart job to at least let it launch.
Other cases that I haven't tried to address here:
- 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.
- The com.ubuntu.
- ALARM_DEFAULT_SOUND and CALENDAR_
| unity-api-1-bot (unity-api-1-bot) wrote | # |
FAILED: Continuous integration, rev:463
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/