From 10e84fe8fadd7f0d6016b296c27e2a5b0bf0dbe2 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 1 Aug 2009 19:36:23 +0200 Subject: [PATCH] Remove list of Rainbow exemptions --- src/sugar/activity/activityfactory.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py index ffa8bc0e..dcd840ff 100644 --- a/src/sugar/activity/activityfactory.py +++ b/src/sugar/activity/activityfactory.py @@ -204,16 +204,8 @@ class ActivityCreationHandler(gobject.GObject): self._bundle = bundle self._service_name = bundle.get_bundle_id() self._handle = handle - - self._use_rainbow = os.path.exists('/etc/olpc-security') - if self._service_name in ['org.laptop.JournalActivity', - 'org.laptop.Terminal', - 'org.laptop.Log', - 'org.laptop.Analyze']: - self._use_rainbow = False bus = dbus.SessionBus() - bus_object = bus.get_object(_SHELL_SERVICE, _SHELL_PATH) self._shell = dbus.Interface(bus_object, _SHELL_IFACE) @@ -252,7 +244,7 @@ class ActivityCreationHandler(gobject.GObject): self._handle.uri) environment_dir = None - if self._use_rainbow: + if os.path.exists('/etc/olpc-security'): environment_dir = tempfile.mkdtemp() command = ['/usr/bin/sudo', '-E', '--', '/usr/bin/rainbow-run',