Merge branch 'master' into next

2011-03-03 19:09:30 +01:00 · 2011-03-03 19:09:30 +01:00 · 4e0aaa07c0
commit 4e0aaa07c0
parent c9ac254c8c 2ab51e6855
2 changed files with 2 additions and 1 deletions
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@ -27,6 +27,7 @@ Bug Fixes
 * Allow SSL connections to send keep-alive messages.
 * Fix regression (UIBase is no more).

+* Make profiling mode really enforce single-threading

 Pending for the next major release
 ==================================
--- a/offlineimap/init.py
+++ b/offlineimap/init.py
@ -169,7 +169,7 @@ class OfflineImap:
        if options.profiledir:
            if not options.singlethreading:
                logging.warn("Profile mode: Forcing to singlethreaded.")
-                options.singlethreaded = True
+                options.singlethreading = True
            profiledir = options.profiledir
            os.mkdir(profiledir)
            threadutil.setprofiledir(profiledir)