Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2006-08-21 17:37:55 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-08-21 17:37:55 (GMT)
commitda80c910811e327e0493e8c6c2acce14f0ae7754 (patch)
tree6f4cc1408220f59f0363dd275b1f09fe6fa4296f
parent7d6adc55a3f174f469c607689572e62a1bcd0aaf (diff)
Enable sugar emulator only if SUGAR_EMULATOR=yes is set
-rwxr-xr-xshell/sugar7
1 files changed, 4 insertions, 3 deletions
diff --git a/shell/sugar b/shell/sugar
index 9db77c7..8108b26 100755
--- a/shell/sugar
+++ b/shell/sugar
@@ -26,9 +26,10 @@ registry.scan_directory(env.get_activities_dir())
from session.Emulator import Emulator
-# FIXE Don't run the emulator on the OLPC
-emulator = Emulator()
-emulator.start()
+if os.environ.has_key('SUGAR_EMULATOR') and \
+ os.environ['SUGAR_EMULATOR'] == 'yes':
+ emulator = Emulator()
+ emulator.start()
from session.Session import Session