Merge lp:~townsend/libertine/fix-missing-dbus-env-var into lp:libertine

[Christopher Townsend]

Fix crash where /run/user/$UID/dbus-session doesn't exist when the update-puritine-containers click hook runs.

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

PASSED: Continuous integration, rev:275
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/61/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/211
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/171
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/171
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/171
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/171
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/171
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/171
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/161/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/214
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/199
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/199
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/199
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/192
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/192/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/192
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/192/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/192
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/192/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/192
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/192/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/192
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/192/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/192
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/192/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Larry Price (larryprice)]

see inline

review: Needs Information

[lp:~townsend/libertine/fix-missing-dbus-env-var]

276. By Christopher Townsend on 2016-07-27

Put the session DBus check in a function.
Also, only favorite the Libertine Scope is the session DBus env var is set.

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

PASSED: Continuous integration, rev:276
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/62/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/212
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/172
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/172
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/172
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/172
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/172
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/172
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/162/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/215
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/200
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/200
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/200
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/193
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/193/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/193
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/193/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/193
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/193/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/193
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/193/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/193
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/193/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/193
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/193/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Larry Price (larryprice)]

lgtm

review: Approve

=== modified file 'tools/update-puritine-containers'
--- tools/update-puritine-containers	2016-07-18 21:00:04 +0000
+++ tools/update-puritine-containers	2016-07-27 15:52:25 +0000
@@ -29,6 +29,22 @@
 puritine_symlink_farm_file = os.path.join(puritine_hook_dir, 'PuritineSymlinkFarm.json')
 puritine_click_config_file = os.path.join('libertine-config', 'libertine', 'ContainersConfig.json')
 
+def set_session_dbus_env_var():
+    if not 'DBUS_SESSION_BUS_ADDRESS' in os.environ:
+        dbus_session_path = os.path.join('/', 'run', 'user', str(os.getuid()), 'dbus-session')
+
+        if os.path.exists(dbus_session_path):
+            with open(dbus_session_path, 'r') as fd:
+                dbus_session_str = fd.read()
+
+                os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_session_str.partition('DBUS_SESSION_BUS_ADDRESS=')[2].rstrip('\n')
+
+                return True
+        else:
+            return False
+
+    return True
+
 def symlink_farm_entries_count():
     if (puritine_symlink_farm_list and
         puritine_symlink_farm_list['customContainers']):
@@ -152,11 +168,7 @@
 
 if __name__ == '__main__':
     puritine_symlink_farm_list = {}
-
-    with open(os.path.join('/', 'run', 'user', str(os.getuid()), 'dbus-session'), 'r') as fd:
-        dbus_session_str = fd.read()
-
-    os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_session_str.partition('DBUS_SESSION_BUS_ADDRESS=')[2].rstrip('\n')
+    update_libertine_scope = set_session_dbus_env_var()
 
     if not os.path.exists(puritine_hook_dir):
         os.makedirs(puritine_hook_dir)
@@ -179,7 +191,8 @@
         json.dump(puritine_symlink_farm_list, fd, sort_keys=True, indent=4)
         fd.write('\n')
 
-    if count_at_start == 0 and count_at_finish > 0:
+    if count_at_start == 0 and count_at_finish > 0 and update_libertine_scope:
         favorite_libertine_scope()
 
-    libertine.utils.refresh_libertine_scope()
+    if update_libertine_scope:
+        libertine.utils.refresh_libertine_scope()