Merge branch 'ss/declutter-tty-output' into next

Conflicts:
	Changelog.draft.rst
This commit is contained in:
Nicolas Sebrecht
2011-03-10 19:26:26 +01:00
3 changed files with 4 additions and 3 deletions

View File

@ -41,7 +41,8 @@ class TTYUI(UIBase):
threadname = currentThread().name
except AttributeError:
threadname = currentThread().getName()
if (threadname == s._lastThreaddisplay):
if (threadname == s._lastThreaddisplay \
or threadname == 'MainThread'):
print " %s" % msg
else:
print "%s:\n %s" % (threadname, msg)