summaryrefslogtreecommitdiff
path: root/tools
diff options
authorDidier Roche <didier.roche@canonical.com>2012-01-20 11:46:46 +0100
committerDidier Roche <didier.roche@canonical.com>2012-01-20 11:46:46 +0100
commit889e67287b55e43a5b7448ac1449ac1ff72ad076 (patch)
treec1911397d6e18054848a49ba1043b3d1fd56aa0a /tools
parent664eb51927bb4a25d4a243fb3b32fd5361342f50 (diff)
kill any previous compiz process as it can hangs before --replace (LP: #919132)
Fixes LP: #919132 (bzr r1854.1.1)
Diffstat (limited to 'tools')
-rwxr-xr-xtools/unity.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/unity.cmake b/tools/unity.cmake
index a1694ce81..791813094 100755
--- a/tools/unity.cmake
+++ b/tools/unity.cmake
@@ -138,6 +138,10 @@ def process_and_start_unity (verbose, debug_mode, compiz_args, log_file):
if log_file:
cli.extend(['2>&1', '|', 'tee', log_file])
+ # kill a previous compiz if was there (this is a hack as compiz can
+ # sometimes get stuck and not exit on --replace)
+ subprocess.call (["pkill", "compiz"])
+
# shell = True as it's the simpest way to | tee.
# In this case, we need a string and not a list
# FIXME: still some bug with 2>&1 not showing everything before wait()