Merge lp:~townsend/libertine/unset_dconf into lp:libertine

[Christopher Townsend]

Workaround issue where a custom dconf profile is on a machine. Of course the profile is not in the chroot, so it messes up some applications.

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

PASSED: Continuous integration, rev:165
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/104/
Executed test runs:
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1001/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/104/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

review: Approve

=== modified file 'python/libertine/ChrootContainer.py'
--- python/libertine/ChrootContainer.py	2016-01-14 14:46:43 +0000
+++ python/libertine/ChrootContainer.py	2016-01-27 21:56:46 +0000
@@ -197,6 +197,11 @@
         # FIXME: Disabling seccomp is a temporary measure until we fully understand why we need
         #        it or figure out when we need it.
         os.environ['PROOT_NO_SECCOMP'] = '1'
+
+        # Workaround issue where a custom dconf profile is on the machine
+        if 'DCONF_PROFILE' in os.environ:
+            del os.environ['DCONF_PROFILE']
+
         proot_cmd = self._build_proot_command()
 
         args = shlex.split(proot_cmd)