Merge lp:~larryprice/libertine/blacklist-env-vars into lp:libertine

Proposed by Larry Price
Status: Merged
Approved by: Larry Price
Approved revision: 172
Merged at revision: 219
Proposed branch: lp:~larryprice/libertine/blacklist-env-vars
Merge into: lp:libertine
Diff against target: 15 lines (+5/-0)
1 file modified
tools/libertine-launch (+5/-0)
To merge this branch: bzr merge lp:~larryprice/libertine/blacklist-env-vars
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
Libertine CI Bot continuous-integration Approve
Review via email: mp+293943@code.launchpad.net

Commit message

Blacklist Mir-related environment variables that interfere with X apps.

Description of the change

Blacklist Mir-related environment variables that wreak havoc on X applications. Test with QtCreator

Adapted from bregma's branch at https://code.launchpad.net/~bregma/libertine/lp-1540091.

To post a comment you must log in.
Revision history for this message
Libertine CI Bot (libertine-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Tested out qtcreator and went from not working to working! yay. +1 from me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/libertine-launch'
2--- tools/libertine-launch 2016-04-11 15:01:38 +0000
3+++ tools/libertine-launch 2016-05-05 21:02:05 +0000
4@@ -69,6 +69,11 @@
5 if not libertine.utils.container_exists(args.container_id):
6 raise RuntimeError("Container ID %s does not exist." % args.container_id)
7
8+ # remove problematic environment variables
9+ for e in ['QT_QPA_PLATFORM', 'LD_LIBRARY_PATH', 'FAKECHROOT_BASE', 'FAKECHROOT_CMD_SUBST']:
10+ if e in os.environ:
11+ del os.environ[e]
12+
13 session_socket_path = set_dbus_session_socket_path()
14
15 session_bridge = launch_libertine_session_bridge(session_socket_path)

Subscribers

People subscribed via source and target branches