Unity

Merge lp:~3v1n0/unity/ccp-profile-unity-script-set into lp:unity

  1. ccp-profile-unity-script-set
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 4149
Proposed branch: lp:~3v1n0/unity/ccp-profile-unity-script-set
Merge into: lp:unity
Diff against target: 16 lines (+6/-0)
1 file modified
tools/unity.cmake (+6/-0)
To merge this branch: bzr merge lp:~3v1n0/unity/ccp-profile-unity-script-set
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+299857@code.launchpad.net

Commit message

Unity script: use result from unity_support_test to check the right COMPIZ_CONFIG_PROFILE to use

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tools/unity.cmake'
--- tools/unity.cmake 2016-04-08 18:13:40 +0000
+++ tools/unity.cmake 2016-07-12 18:44:47 +0000
@@ -59,6 +59,12 @@
5959
60 os.environ['COMPIZ_CONFIG_PROFILE'] = 'ubuntu'60 os.environ['COMPIZ_CONFIG_PROFILE'] = 'ubuntu'
6161
62 try:
63 if subprocess.call('/usr/lib/nux/unity_support_test -f'.split()) > 0:
64 os.environ['COMPIZ_CONFIG_PROFILE'] = 'ubuntu-lowgfx'
65 except:
66 pass
67
62 if not 'DISPLAY' in os.environ:68 if not 'DISPLAY' in os.environ:
63 # take an optimistic chance and warn about it :)69 # take an optimistic chance and warn about it :)
64 print("WARNING: no DISPLAY variable set, setting it to :0")70 print("WARNING: no DISPLAY variable set, setting it to :0")