From 37d0fe8b01950dcbf8e3b0138db9f0da51f149da Mon Sep 17 00:00:00 2001 From: Nicolas Sebrecht Date: Wed, 16 Mar 2011 20:46:18 +0100 Subject: [PATCH 1/2] v6.3.2.1 Signed-off-by: Nicolas Sebrecht --- Changelog.draft.rst | 3 --- Changelog.maint.rst | 24 ++++++++++++++++++++++++ Makefile | 2 +- offlineimap/__init__.py | 2 +- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 Changelog.maint.rst diff --git a/Changelog.draft.rst b/Changelog.draft.rst index e754f50..8b599f9 100644 --- a/Changelog.draft.rst +++ b/Changelog.draft.rst @@ -19,9 +19,6 @@ Changes Bug Fixes --------- -* Fix regression (UIBase is no more). - -* Make profiling mode really enforce single-threading Pending for the next major release ================================== diff --git a/Changelog.maint.rst b/Changelog.maint.rst new file mode 100644 index 0000000..605ee8c --- /dev/null +++ b/Changelog.maint.rst @@ -0,0 +1,24 @@ +========= +ChangeLog +========= + +:website: http://offlineimap.org + +This is the Changelog of the maintenance branch. + +**NOTE FROM THE MAINTAINER:** + Contributors should use the `WIP` section in Changelog.draft.rst in order to + add changes they are working on. I will use it to make the new changelog entry + on releases. And because I'm lazy, it will also be used as a draft for the + releases announces. + + +OfflineIMAP v6.3.2.1 (2011-03-23) +================================= + +Bug Fixes +--------- + +* Sanity checks for SSL cacertfile configuration. +* Fix regression (UIBase is no more). +* Make profiling mode really enforce single-threading. diff --git a/Makefile b/Makefile index 7d45f38..5970dd9 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -VERSION=6.3.2 +VERSION=6.3.2.1 TARGZ=offlineimap_$(VERSION).tar.gz SHELL=/bin/bash RST2HTML=`type rst2html 2>/dev/null 2>&1 && echo rst2html || echo rst2html.py` diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py index 4a760df..26b6a62 100644 --- a/offlineimap/__init__.py +++ b/offlineimap/__init__.py @@ -1,7 +1,7 @@ __all__ = ['OfflineImap'] __productname__ = 'OfflineIMAP' -__version__ = "6.3.2" +__version__ = "6.3.2.1" __copyright__ = "Copyright (C) 2002 - 2010 John Goerzen" __author__ = "John Goerzen" __author_email__= "john@complete.org" From 65faec834fed1f2409c9874203fd36ab571015aa Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Thu, 24 Mar 2011 10:13:56 +0100 Subject: [PATCH 2/2] accounts.py: Print the stacktrace via traceback module All other instances were converted to format crash output including a stacktrace, but this one seems to have been left out. Make Exceptions print their stacktrace here too. Signed-off-by: Sebastian Spaeth Signed-off-by: Nicolas Sebrecht --- offlineimap/accounts.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py index 8c03e69..63e83fa 100644 --- a/offlineimap/accounts.py +++ b/offlineimap/accounts.py @@ -379,4 +379,5 @@ def syncfolder(accountname, remoterepos, remotefolder, localrepos, raise except: ui.warn("ERROR in syncfolder for %s folder %s: %s" % \ - (accountname,remotefolder.getvisiblename(),sys.exc_info()[1])) + (accountname,remotefolder.getvisiblename(), + traceback.format_exc()))