From 147d80aa7875c28b1b22e4d763295542ae033807 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Sat, 13 Jul 2013 11:05:41 -0600 Subject: [PATCH] ActivityFactory: don't run which to check for rainbow One less thing to do in the common activity startup path. Also, which might not be available. --- src/sugar3/activity/activityfactory.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/sugar3/activity/activityfactory.py b/src/sugar3/activity/activityfactory.py index c2839ef1..56fe39c2 100644 --- a/src/sugar3/activity/activityfactory.py +++ b/src/sugar3/activity/activityfactory.py @@ -223,12 +223,9 @@ class ActivityCreationHandler(GObject.GObject): self._handle.object_id, self._handle.uri, self._handle.invited) - dev_null = file('/dev/null', 'w') environment_dir = None - 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: + if os.path.exists('/etc/olpc-security') \ + and os.access('/usr/bin/rainbow-run', os.X_OK): environment_dir = tempfile.mkdtemp() command = ['sudo', '-E', '--', 'rainbow-run',