URL Dispatcher

Merge lp:~mterry/url-dispatcher/snap-support into lp:url-dispatcher/16.10

  1. snap-support
  2. Merge into trunk.16.10
Proposed by Michael Terry on 2016-09-23
Status: Merged
Approved by: Michael Terry on 2016-11-08
Approved revision: 95
Merged at revision: 96
Proposed branch: lp:~mterry/url-dispatcher/snap-support
Merge into: lp:url-dispatcher/16.10
Diff against target: 32 lines (+3/-3)
3 files modified
data/url-dispatcher-update-system.conf.in (+1/-1)
data/url-dispatcher-update-user.conf.in (+1/-1)
data/url-dispatcher.conf.in (+1/-1)
To merge this branch: bzr merge lp:~mterry/url-dispatcher/snap-support
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing on 2016-11-08
dobey (community) 2016-09-23 Approve on 2016-11-02
Review via email: mp+306664@code.launchpad.net

Commit Message

Support running inside a snap.

Description of the Change

Use a provided snappy root directory, if one is provided. This way we'll find ourselves inside of a snap.

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

FAILED: Continuous integration, rev:94
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/24/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/762/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/768
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/576/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/576/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/576/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/576/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/576/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/576/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/576/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/576/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/576/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/24/rebuild

review: Needs Fixing (continuous-integration)
dobey (dobey) :
review: Approve
lp:~mterry/url-dispatcher/snap-support updated on 2016-11-08
95. By Michael Terry on 2016-11-08

Drop env var in 'start on' stanza -- doesn't work, and isn't needed in snap mode anyway

unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:95
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/28/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1026/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1033
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/824/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/824/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/824/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/824/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/824/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/824/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/824/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/824/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/824/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/28/rebuild

review: Needs Fixing (continuous-integration)
lp:~mterry/url-dispatcher/snap-support updated on 2016-11-08
96. By Michael Terry on 2016-11-08

Merge from trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/url-dispatcher-update-system.conf.in'
2--- data/url-dispatcher-update-system.conf.in 2015-09-04 19:53:45 +0000
3+++ data/url-dispatcher-update-system.conf.in 2016-11-08 22:16:08 +0000
4@@ -13,4 +13,4 @@
5 fi
6 end script
7
8-exec @pkglibexecdir@/update-directory "@datadir@/url-dispatcher/urls"
9+exec ${SNAP}@pkglibexecdir@/update-directory "${SNAP}@datadir@/url-dispatcher/urls"
10
11=== modified file 'data/url-dispatcher-update-user.conf.in'
12--- data/url-dispatcher-update-user.conf.in 2016-08-30 16:27:12 +0000
13+++ data/url-dispatcher-update-user.conf.in 2016-11-08 22:16:08 +0000
14@@ -13,4 +13,4 @@
15 fi
16 end script
17
18-exec @pkglibexecdir@/update-directory "${HOME}/.config/url-dispatcher/urls/"
19+exec ${SNAP}@pkglibexecdir@/update-directory "${HOME}/.config/url-dispatcher/urls/"
20
21=== modified file 'data/url-dispatcher.conf.in'
22--- data/url-dispatcher.conf.in 2016-08-09 22:06:47 +0000
23+++ data/url-dispatcher.conf.in 2016-11-08 22:16:08 +0000
24@@ -10,7 +10,7 @@
25 emits untrusted-helper-type-end
26
27 script
28- @pkglibexecdir@/url-dispatcher
29+ ${SNAP}@pkglibexecdir@/url-dispatcher
30 if [ $? -ne 0 ]; then
31 retval = $?
32 rm -rf ${HOME}/.cache/url-dispatcher/urls-1.db*

Subscribers

People subscribed via source and target branches