tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	Changelog.draft.rst
This commit is contained in:
Nicolas Sebrecht 2011-03-10 19:26:26 +01:00
commit 5048d16913
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.draft.rst
View File

@ -29,6 +29,7 @@ Changes
blowing away LocalStatus will not require you to redownload ALL of blowing away LocalStatus will not require you to redownload ALL of
your mails if you still have the local Maildir. It will simply your mails if you still have the local Maildir. It will simply
recreate LocalStatus. recreate LocalStatus.
* TTYUI ouput improved.
Bug Fixes Bug Fixes
--------- ---------

3
offlineimap/accounts.py
View File

@ -253,8 +253,7 @@ class SyncableAccount(Account):
thread = InstanceLimitedThread(\ thread = InstanceLimitedThread(\
instancename = 'FOLDER_' + self.remoterepos.getname(), instancename = 'FOLDER_' + self.remoterepos.getname(),
target = syncfolder, target = syncfolder,
name = "Folder sync %s[%s]" % \ name = "Folder sync [%s]" % self.name,
(self.name, remotefolder.getvisiblename()),
args = (self.name, remoterepos, remotefolder, localrepos, args = (self.name, remoterepos, remotefolder, localrepos,
statusrepos, quick)) statusrepos, quick))
thread.setDaemon(1) thread.setDaemon(1)

3
offlineimap/ui/TTY.py
View File

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