Merge lp:~townsend/libertine/use-snap-user-common into lp:libertine

[Christopher Townsend]

Redirect where the container is created when in a snap environment.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:343
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/245/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/512
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/405
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/405
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/405
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/405
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/405
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/405
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/522
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/506
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/506/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/506
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/506/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/506
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/506/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/506
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/506/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/506
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/506/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/506
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/506/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/245/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

lgtm

review: Approve

=== modified file 'python/libertine/ChrootContainer.py'
--- python/libertine/ChrootContainer.py	2016-12-01 17:43:12 +0000
+++ python/libertine/ChrootContainer.py	2016-12-02 16:40:16 +0000
@@ -167,7 +167,7 @@
     def _build_fakechroot_command(self):
         cmd = 'fakechroot'
 
-        if 'SNAP' in os.environ:
+        if utils.is_snap_environment():
             cmd = "{} -b {}/usr/sbin".format(cmd, os.environ['SNAP'])
 
         return cmd

=== modified file 'python/libertine/utils.py'
--- python/libertine/utils.py	2016-11-09 20:10:45 +0000
+++ python/libertine/utils.py	2016-12-02 16:40:16 +0000
@@ -57,10 +57,13 @@
 
 
 def get_libertine_containers_dir_path():
-    xdg_cache_home = os.getenv('XDG_CACHE_HOME',
-                                os.path.join(os.getenv('HOME'), '.cache'))
+    if is_snap_environment():
+        libertine_cache_home = os.path.join(os.getenv('SNAP_USER_COMMON'), '.cache')
+    else:
+        libertine_cache_home = os.getenv('XDG_CACHE_HOME',
+                                    os.path.join(os.getenv('HOME'), '.cache'))
 
-    return os.path.join(xdg_cache_home, 'libertine-container')
+    return os.path.join(libertine_cache_home, 'libertine-container')
 
 
 def get_libertine_database_dir_path():
@@ -191,3 +194,10 @@
             return False
 
     return True
+
+
+def is_snap_environment():
+    if 'SNAP' in os.environ:
+        return True
+    else:
+        return False