diff options
| author | Sascha Silbe <sascha@silbe.org> | 2009-09-27 17:00:52 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha@silbe.org> | 2009-09-30 14:21:21 (GMT) |
| commit | 865b6f513d75911a9c842c15fcc4e5c73825f8b7 (patch) | |
| tree | a77bdf3d0fe36f78fa5a28eb1e317603436d4c85 | |
| parent | ee664932e9412fac36f26be8c898da32c5a28bb9 (diff) | |
Revert previous patch so we can have another go to address review comments.
This reverts commit 9184c6c46826cfd723db5ed7ab1f824fea5ba557.
| -rw-r--r-- | src/sugar/activity/activityfactory.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py index b618475..ee0fd92 100644 --- a/src/sugar/activity/activityfactory.py +++ b/src/sugar/activity/activityfactory.py @@ -205,8 +205,6 @@ class ActivityCreationHandler(gobject.GObject): self._bundle = bundle self._service_name = bundle.get_bundle_id() self._handle = handle - self._rainbow_enabled = os.system('which rainbow-run') == 0 and \ - os.path.exists('/etc/olpc-security') bus = dbus.SessionBus() bus_object = bus.get_object(_SHELL_SERVICE, _SHELL_PATH) @@ -247,12 +245,12 @@ class ActivityCreationHandler(gobject.GObject): self._handle.uri) environment_dir = None - if self._rainbow_enabled: + if os.path.exists('/etc/olpc-security'): environment_dir = tempfile.mkdtemp() - command = ['sudo', '-E', '--', - 'rainbow-run', + command = ['/usr/bin/sudo', '-E', '--', + '/usr/bin/rainbow-run', '-v', '-v', - '-a', 'rainbow-sugarize', + '-a', '/usr/bin/rainbow-sugarize', '-s', '/var/spool/rainbow/2', '-f', '1', '-f', '2', |