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

Merge branch 'master' into next

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

1
Changelog.draft.rst
View File

@ -24,6 +24,7 @@ Bug Fixes
--------- ---------
* Allow SSL connections to send keep-alive messages. * Allow SSL connections to send keep-alive messages.
* Fix regression (UIBase is no more).
Pending for the next major release Pending for the next major release

3
offlineimap/repository/Base.py
View File

@ -19,7 +19,6 @@
from offlineimap import CustomConfig from offlineimap import CustomConfig
from offlineimap.ui import getglobalui from offlineimap.ui import getglobalui
import os.path import os.path
import sys
import traceback import traceback
def LoadRepository(name, account, reqtype): def LoadRepository(name, account, reqtype):
@ -167,7 +166,7 @@ class BaseRepository(CustomConfig.ConfigHelperMixin):
except (KeyboardInterrupt): except (KeyboardInterrupt):
raise raise
except: except:
UIBase.getglobalui().warn("ERROR Attempting to make folder " \ getglobalui().warn("ERROR Attempting to create folder " \
+ key + ":" +traceback.format_exc()) + key + ":" +traceback.format_exc())
# #