Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2006-06-20 03:04:53 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-06-20 03:04:53 (GMT)
commit758d9fba4350d7f5eb48a3ebe6fbd3cba4a7fcf0 (patch)
tree2d9e0d1f2832fb70c8904fb1e25fcc8c23539c1f /sugar
parent8bcdb8f3dd25ab31da3ce4c76c477c3017f2f712 (diff)
Always enable console
Diffstat (limited to 'sugar')
-rw-r--r--sugar/session/LogWriter.py2
-rwxr-xr-xsugar/sugar7
2 files changed, 2 insertions, 7 deletions
diff --git a/sugar/session/LogWriter.py b/sugar/session/LogWriter.py
index be9e5fb..1368e5d 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 28544fc..1ec9a6a 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