Merge lp:~mterry/mediascanner2/snap-root into lp:mediascanner2

[Michael Terry]

Handle running inside of a snap by respecting the $SNAP variable.

Handle running inside of a snap by respecting the $SNAP variable.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:337
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/13/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1051
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1058
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/847
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/847/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/847
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/847/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/847
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/847/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/847
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/847/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/847
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/847/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/847
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/847/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/847
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/847/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/847
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/847/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/847
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/847/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

LGTM. +1

review: Approve

[James Henstridge (jamesh)]

Actually, one question: do you need to do anything about the D-Bus service activation file for mediascanner-exctractor? It has a full pathname to start the daemon.

[Michael Terry (mterry)]

James, we do... But that's a separate bug. DBus doesn't handle relative paths in those files. See bug 1633520 for a long-term snappy solution.

In the meantime, the unity8 session snap has a workaround and adjusts all the service files before snapping them up.

[Alejandro J. Cura (alecu)]

James, can we get this in a silo, and land it on Xenial overlay and zeisty?

=== modified file 'mediascanner-2.0.conf.in'
--- mediascanner-2.0.conf.in	2015-10-22 12:13:04 +0000
+++ mediascanner-2.0.conf.in	2016-11-11 00:09:25 +0000
@@ -4,4 +4,4 @@
 start on started dbus
 
 respawn
-exec @CMAKE_INSTALL_FULL_BINDIR@/mediascanner-service-2.0
+exec $SNAP@CMAKE_INSTALL_FULL_BINDIR@/mediascanner-service-2.0