From aec661b33e0de041423f2debf0e5c0b1f0476212 Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Sun, 17 Jan 2010 16:02:28 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:sugar-toolkit/mainline

---
(limited to 'src/sugar/activity/activityfactory.py')

diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py
index ee0fd92..c195572 100644
--- a/src/sugar/activity/activityfactory.py
+++ b/src/sugar/activity/activityfactory.py
@@ -244,13 +244,17 @@ class ActivityCreationHandler(gobject.GObject):
                               self._handle.object_id,
                               self._handle.uri)
 
+        dev_null = file('/dev/null', 'w')
         environment_dir = None
-        if os.path.exists('/etc/olpc-security'):
+        rainbow_found = subprocess.call(['which', 'rainbow-run'],
+            stdout=dev_null, stderr=dev_null) == 0
+        use_rainbow = rainbow_found and os.path.exists('/etc/olpc-security')
+        if use_rainbow:
             environment_dir = tempfile.mkdtemp()
-            command = ['/usr/bin/sudo', '-E', '--',
-                       '/usr/bin/rainbow-run',
+            command = ['sudo', '-E', '--',
+                       'rainbow-run',
                        '-v', '-v',
-                       '-a', '/usr/bin/rainbow-sugarize',
+                       '-a', 'rainbow-sugarize',
                        '-s', '/var/spool/rainbow/2',
                        '-f', '1',
                        '-f', '2',
--
cgit v0.9.1