Merge lp:~bregma/unity/lp-1324114 into lp:unity

[Stephen M. Webb]

reduce the scope of the kill command when restarting compiz

Reduced the scope of the kill command when restarting compiz so that only those on the same $DISPLAY get clobbered.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3824
http://jenkins.qa.ubuntu.com/job/unity-ci/975/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/62/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/975/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Looks fine, I would use a regex to avoid other false positive checks btw

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3824
http://jenkins.qa.ubuntu.com/job/unity-ci/989/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/76

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/989/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3825
http://jenkins.qa.ubuntu.com/job/unity-ci/991/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/78

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/991/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'tools/unity.cmake'
--- tools/unity.cmake	2014-03-22 17:05:04 +0000
+++ tools/unity.cmake	2014-07-08 14:29:23 +0000
@@ -22,6 +22,7 @@
 import glob
 from optparse import OptionParser
 import os
+import re
 import shutil
 import signal
 import subprocess
@@ -100,7 +101,19 @@
 
     # 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", "-9", "compiz"])
+    display = "DISPLAY=" + os.environ["DISPLAY"]
+    pids = [pid for pid in os.listdir("/proc") if pid.isdigit()]
+
+    for pid in pids:
+        try:
+            pid_path = os.path.join("/proc", pid)
+            cmdline = open(os.path.join(pid_path, "cmdline"), "rb").read()
+            if re.match(r"^compiz\b", cmdline):
+                compiz_env = open(os.path.join(pid_path, "environ"), "rb").read()
+                if display in compiz_env:
+                    subprocess.call (["kill", "-9", pid])
+        except IOError:
+            continue
 
     # shell = True as it's the simpest way to | tee.
     # In this case, we need a string and not a list