1
=== modified file 'python/libertine/ChrootContainer.py'
2
--- python/libertine/ChrootContainer.py	2016-12-01 17:43:12 +0000
3
+++ python/libertine/ChrootContainer.py	2016-12-02 16:40:16 +0000
4
@@ -167,7 +167,7 @@
5
167
    def _build_fakechroot_command(self):
167
    def _build_fakechroot_command(self):
6
168
        cmd = 'fakechroot'
168
        cmd = 'fakechroot'
7
169
169
9
170
        if 'SNAP' in os.environ:
170
        if utils.is_snap_environment():
10
171
            cmd = "{} -b {}/usr/sbin".format(cmd, os.environ['SNAP'])
171
            cmd = "{} -b {}/usr/sbin".format(cmd, os.environ['SNAP'])
11
172
172
12
173
        return cmd
173
        return cmd
13
174
174
14
=== modified file 'python/libertine/utils.py'
15
--- python/libertine/utils.py	2016-11-09 20:10:45 +0000
16
+++ python/libertine/utils.py	2016-12-02 16:40:16 +0000
17
@@ -57,10 +57,13 @@
18
57
57
19
58
58
20
59
def get_libertine_containers_dir_path():
59
def get_libertine_containers_dir_path():
23
60
    xdg_cache_home = os.getenv('XDG_CACHE_HOME',
60
    if is_snap_environment():
24
61
                                os.path.join(os.getenv('HOME'), '.cache'))
61
        libertine_cache_home = os.path.join(os.getenv('SNAP_USER_COMMON'), '.cache')
25
62
    else:
26
63
        libertine_cache_home = os.getenv('XDG_CACHE_HOME',
27
64
                                    os.path.join(os.getenv('HOME'), '.cache'))
28
62
65
30
63
    return os.path.join(xdg_cache_home, 'libertine-container')
66
    return os.path.join(libertine_cache_home, 'libertine-container')
31
64
67
32
65
68
33
66
def get_libertine_database_dir_path():
69
def get_libertine_database_dir_path():
34
@@ -191,3 +194,10 @@
35
191
            return False
194
            return False
36
192
195
37
193
    return True
196
    return True
38
197
39
198
40
199
def is_snap_environment():
41
200
    if 'SNAP' in os.environ:
42
201
        return True
43
202
    else:
44
203
        return False
Status:	Merged
Approved by:	Larry Price on 2016-12-02
Approved revision:	343
Merged at revision:	344
Proposed branch:	lp:~townsend/libertine/use-snap-user-common
Merge into:	lp:libertine
Diff against target:	44 lines (+14/-4) 2 files modified python/libertine/ChrootContainer.py (+1/-1) python/libertine/utils.py (+13/-3)
To merge this branch:	bzr merge lp:~townsend/libertine/use-snap-user-common
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Larry Price		2016-12-02	Approve on 2016-12-02
Libertine CI Bot	continuous-integration		Approve on 2016-12-02
Review via email: mp+312374@code.launchpad.net