Merge lp:~mterry/unity-scopes-shell/snap-root into lp:unity-scopes-shell

[Michael Terry]

Handle running inside a snap by paying attention to the $SNAP prefix.

Handle running inside a snap by paying attention to the $SNAP prefix.

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

PASSED: Continuous integration, rev:346
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-shell-ci/3/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/835
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/842
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/649
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/649/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/649
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/649/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/649
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/649/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/649
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/649/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/649
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/649/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/649
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/649/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/649
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/649/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/649
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/649/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/649
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/649/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

LGTM

review: Approve

=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2016-06-23 12:53:21 +0000
+++ src/Unity/scopes.cpp	2016-10-06 14:45:52 +0000
@@ -212,8 +212,9 @@
         {QStringLiteral("libunity-scopes"), QStringLiteral("scopes-api")}});
 
     // determine versions of unity8, unity-plugin-scopes and libunity-scopes1.0
+    QString snapRoot = QFile::decodeName(qgetenv("SNAP"));
     for (QMap<QString, QString>::const_iterator pkg = versions.constBegin(); pkg != versions.constEnd(); pkg++) {
-        QFile versionFile("/var/lib/" + pkg.key() + "/version");
+        QFile versionFile(snapRoot + "/var/lib/" + pkg.key() + "/version");
         if (versionFile.open(QIODevice::ReadOnly)) {
             QTextStream str(&versionFile);
             QString ver;