Merge lp:~jamesh/thumbnailer/use-thumbnailer-interface into lp:thumbnailer/devel

Proposed by James Henstridge
Status: Merged
Approved by: Michi Henning
Approved revision: 374
Merged at revision: 375
Proposed branch: lp:~jamesh/thumbnailer/use-thumbnailer-interface
Merge into: lp:thumbnailer/devel
Diff against target: 39 lines (+2/-11)
1 file modified
snap/snapcraft.yaml (+2/-11)
To merge this branch: bzr merge lp:~jamesh/thumbnailer/use-thumbnailer-interface
Reviewer Review Type Date Requested Status
Michi Henning (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+317744@code.launchpad.net

Commit message

Switch to the specialised "thumbnailer" snapd interface.

Description of the change

Switch to the specialised "thumbnailer" snapd interface.

I also moved snapcraft.yaml to snap/snapcraft.yaml, which seems to be the preferred location now. You should still run "snapcraft" at the root of the branch.

This interface is only available in the upcoming snapd 2.23, which will hopefully be released soon. It might be worth delaying merging this until it is out.

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:374
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/37/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1697
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1704
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1479
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1479/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1479
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1479/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1479
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1479/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1479
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1479/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1479
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1479/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1479
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1479/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Interface has merged into snapd now, so all good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'snap'
=== renamed file 'snapcraft.yaml' => 'snap/snapcraft.yaml'
--- snapcraft.yaml 2017-02-08 06:54:23 +0000
+++ snap/snapcraft.yaml 2017-02-20 07:29:38 +0000
@@ -11,9 +11,7 @@
1111
12slots:12slots:
13 thumbnailer:13 thumbnailer:
14 interface: dbus14 interface: thumbnailer
15 name: com.canonical.Thumbnailer
16 bus: session
1715
18plugs:16plugs:
19 platform:17 platform:
@@ -21,12 +19,8 @@
21 content: ubuntu-app-platform119 content: ubuntu-app-platform1
22 target: ubuntu-app-platform20 target: ubuntu-app-platform
23 default-provider: ubuntu-app-platform21 default-provider: ubuntu-app-platform
24 network-manager:
25 interface: network-manager
26 thumbnails:22 thumbnails:
27 interface: dbus23 interface: thumbnailer
28 name: com.canonical.Thumbnailer
29 bus: session
3024
31apps:25apps:
32 thumbnailer-service:26 thumbnailer-service:
@@ -37,9 +31,6 @@
37 plugs:31 plugs:
38 - platform32 - platform
39 - network33 - network
40 # TODO: This grants more privileges than we really need but, without this, apparmor
41 # denies access.
42 - network-manager
43 # TODO: The gsettings interface currently does not permit reading.34 # TODO: The gsettings interface currently does not permit reading.
44 # See https://bugs.launchpad.net/snappy/+bug/160015435 # See https://bugs.launchpad.net/snappy/+bug/1600154
45 # For now, the service uses default settings because it's gsettings lookups fail.36 # For now, the service uses default settings because it's gsettings lookups fail.

Subscribers

People subscribed via source and target branches

to all changes: