diff options
| author | Sascha Silbe <sascha@silbe.org> | 2009-09-27 17:10:58 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha@silbe.org> | 2009-09-30 14:20:43 (GMT) |
| commit | eabbe8fa1185c99e424468745968c2eb652964cc (patch) | |
| tree | fb0811ccf5bd56d4af4c0f97c994066277752ca2 | |
| parent | 33251127cd0451d47000647d2e462670e2b5cb75 (diff) | |
don't use rainbow if it has been uninstalled, but the config file remains (#1317)bug-1317
| -rw-r--r-- | src/sugar/activity/activityfactory.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py index ee0fd92..4e3ca49 100644 --- a/src/sugar/activity/activityfactory.py +++ b/src/sugar/activity/activityfactory.py @@ -244,8 +244,12 @@ 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_enabled = subprocess.call(['which', 'rainbow-run'], + stdout=dev_null, stderr=dev_null) == 0 and \ + os.path.exists('/etc/olpc-security') + if rainbow_enabled: environment_dir = tempfile.mkdtemp() command = ['/usr/bin/sudo', '-E', '--', '/usr/bin/rainbow-run', |