Ticket #1317: 0001-don-t-use-rainbow-if-it-has-been-uninstalled-but-the.patch

File 0001-don-t-use-rainbow-if-it-has-been-uninstalled-but-the.patch, 1.2 KB (added by sascha_silbe, 15 years ago)

don't use rainbow if it has been uninstalled, but the config file remains

  • src/sugar/activity/activityfactory.py 

    From c11ccca63c158b1f1328233ab6ff2dee92e71ee3 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <sascha@silbe.org>
Date: Sun, 27 Sep 2009 19:10:58 +0200
Subject: [PATCH] don't use rainbow if it has been uninstalled, but the config file remains (#1317)

---
 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 b class ActivityCreationHandler(gobject.GObject): 
    244244                              self._handle.object_id,
    245245                              self._handle.uri)
    246246
     247        dev_null = file('/dev/null', 'w')
    247248        environment_dir = None
    248         if os.path.exists('/etc/olpc-security'):
     249        rainbow_enabled = subprocess.call(['which', 'rainbow-run'],
     250            stdout=dev_null, stderr=dev_null) == 0 and \
     251            os.path.exists('/etc/olpc-security')
     252        if rainbow_enabled:
    249253            environment_dir = tempfile.mkdtemp()
    250254            command = ['/usr/bin/sudo', '-E', '--',
    251255                       '/usr/bin/rainbow-run',