Merge lp:~didrocks/unity/die-compiz-die into lp:unity

Proposed by Didier Roche
Status: Merged
Approved by: Gord Allott
Approved revision: 1856
Merged at revision: 1855
Proposed branch: lp:~didrocks/unity/die-compiz-die
Merge into: lp:unity
Diff against target: 14 lines (+4/-0)
1 file modified
tools/unity.cmake (+4/-0)
To merge this branch: bzr merge lp:~didrocks/unity/die-compiz-die
Reviewer Review Type Date Requested Status
Gord Allott (community) Approve
Review via email: mp+89407@code.launchpad.net

Description of the change

kill any previous compiz process as it can hangs before --replace
(LP: #919132)

To post a comment you must log in.
Revision history for this message
Gord Allott (gordallott) :
review: Approve
Revision history for this message
Gord Allott (gordallott) :
review: Approve
Revision history for this message
Gord Allott (gordallott) :
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 2011-12-20 10:16:23 +0000
+++ tools/unity.cmake 2012-01-20 11:00:30 +0000
@@ -138,6 +138,10 @@
138 if log_file:138 if log_file:
139 cli.extend(['2>&1', '|', 'tee', log_file])139 cli.extend(['2>&1', '|', 'tee', log_file])
140140
141 # kill a previous compiz if was there (this is a hack as compiz can
142 # sometimes get stuck and not exit on --replace)
143 subprocess.call (["pkill", "-9", "compiz"])
144
141 # shell = True as it's the simpest way to | tee.145 # shell = True as it's the simpest way to | tee.
142 # In this case, we need a string and not a list146 # In this case, we need a string and not a list
143 # FIXME: still some bug with 2>&1 not showing everything before wait()147 # FIXME: still some bug with 2>&1 not showing everything before wait()