1
=== modified file 'tools/update-puritine-containers'
2
--- tools/update-puritine-containers	2016-07-18 21:00:04 +0000
3
+++ tools/update-puritine-containers	2016-07-27 15:52:25 +0000
4
@@ -29,6 +29,22 @@
5
29
puritine_symlink_farm_file = os.path.join(puritine_hook_dir, 'PuritineSymlinkFarm.json')
29
puritine_symlink_farm_file = os.path.join(puritine_hook_dir, 'PuritineSymlinkFarm.json')
6
30
puritine_click_config_file = os.path.join('libertine-config', 'libertine', 'ContainersConfig.json')
30
puritine_click_config_file = os.path.join('libertine-config', 'libertine', 'ContainersConfig.json')
7
31
31
8
32
def set_session_dbus_env_var():
9
33
    if not 'DBUS_SESSION_BUS_ADDRESS' in os.environ:
10
34
        dbus_session_path = os.path.join('/', 'run', 'user', str(os.getuid()), 'dbus-session')
11
35
12
36
        if os.path.exists(dbus_session_path):
13
37
            with open(dbus_session_path, 'r') as fd:
14
38
                dbus_session_str = fd.read()
15
39
16
40
                os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_session_str.partition('DBUS_SESSION_BUS_ADDRESS=')[2].rstrip('\n')
17
41
18
42
                return True
19
43
        else:
20
44
            return False
21
45
22
46
    return True
23
47
24
32
def symlink_farm_entries_count():
48
def symlink_farm_entries_count():
25
33
    if (puritine_symlink_farm_list and
49
    if (puritine_symlink_farm_list and
26
34
        puritine_symlink_farm_list['customContainers']):
50
        puritine_symlink_farm_list['customContainers']):
27
@@ -152,11 +168,7 @@
28
152
168
29
153
if __name__ == '__main__':
169
if __name__ == '__main__':
30
154
    puritine_symlink_farm_list = {}
170
    puritine_symlink_farm_list = {}
36
155
171
    update_libertine_scope = set_session_dbus_env_var()
32
156
    with open(os.path.join('/', 'run', 'user', str(os.getuid()), 'dbus-session'), 'r') as fd:
33
157
        dbus_session_str = fd.read()
34
158
35
159
    os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_session_str.partition('DBUS_SESSION_BUS_ADDRESS=')[2].rstrip('\n')
37
160
172
38
161
    if not os.path.exists(puritine_hook_dir):
173
    if not os.path.exists(puritine_hook_dir):
39
162
        os.makedirs(puritine_hook_dir)
174
        os.makedirs(puritine_hook_dir)
40
@@ -179,7 +191,8 @@
41
179
        json.dump(puritine_symlink_farm_list, fd, sort_keys=True, indent=4)
191
        json.dump(puritine_symlink_farm_list, fd, sort_keys=True, indent=4)
42
180
        fd.write('\n')
192
        fd.write('\n')
43
181
193
45
182
    if count_at_start == 0 and count_at_finish > 0:
194
    if count_at_start == 0 and count_at_finish > 0 and update_libertine_scope:
46
183
        favorite_libertine_scope()
195
        favorite_libertine_scope()
47
184
196
49
185
    libertine.utils.refresh_libertine_scope()
197
    if update_libertine_scope:
50
198
        libertine.utils.refresh_libertine_scope()
Reviewer	Review Type	Date Requested	Status
Larry Price		2016-07-27	Approve on 2016-07-27
Libertine CI Bot	continuous-integration		Approve on 2016-07-27
Review via email: mp+301291@code.launchpad.net