From 758d9fba4350d7f5eb48a3ebe6fbd3cba4a7fcf0 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Mon, 19 Jun 2006 23:04:53 -0400 Subject: [PATCH] Always enable console --- sugar/session/LogWriter.py | 2 +- sugar/sugar | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sugar/session/LogWriter.py b/sugar/session/LogWriter.py index be9e5fb2..1368e5d1 100644 --- a/sugar/session/LogWriter.py +++ b/sugar/session/LogWriter.py @@ -16,7 +16,7 @@ class LogWriter: self._logger = dbus.Interface(proxy_obj, 'com.redhat.Sugar.Logger') def start(self): - if os.environ.has_key('SUGAR_USE_CONSOLE') and self._use_console: + if self._use_console: sys.stdout = self sys.stderr = self diff --git a/sugar/sugar b/sugar/sugar index 28544fce..1ec9a6a9 100755 --- a/sugar/sugar +++ b/sugar/sugar @@ -62,8 +62,6 @@ if curdir == '.': else: basedir = os.path.dirname(curdir) -console = False - if os.path.isfile(os.path.join(curdir, '__uninstalled__.py')): if basedir == '': print 'Running sugar from current directory...' @@ -71,15 +69,12 @@ if os.path.isfile(os.path.join(curdir, '__uninstalled__.py')): print 'Running sugar from ' + basedir + ' ...' add_to_python_path(basedir) add_to_python_path(os.path.join(basedir, 'cut-n-paste')) - console = True else: print 'Running the installed sugar...' add_to_python_path(os.path.expanduser('~/.sugar/activities')) -if console: - os.environ['SUGAR_USE_CONSOLE'] = 'yes' - print 'Redirecting output to the console, press ctrl+d to open it.' +print 'Redirecting output to the console, press ctrl+d to open it.' from sugar.session.session import Session