Merge branch 'master' into next
This commit is contained in:
		@@ -27,6 +27,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).
 | 
					* Fix regression (UIBase is no more).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					* Make profiling mode really enforce single-threading
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Pending for the next major release
 | 
					Pending for the next major release
 | 
				
			||||||
==================================
 | 
					==================================
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -169,7 +169,7 @@ class OfflineImap:
 | 
				
			|||||||
        if options.profiledir:
 | 
					        if options.profiledir:
 | 
				
			||||||
            if not options.singlethreading:
 | 
					            if not options.singlethreading:
 | 
				
			||||||
                logging.warn("Profile mode: Forcing to singlethreaded.")
 | 
					                logging.warn("Profile mode: Forcing to singlethreaded.")
 | 
				
			||||||
                options.singlethreaded = True
 | 
					                options.singlethreading = True
 | 
				
			||||||
            profiledir = options.profiledir
 | 
					            profiledir = options.profiledir
 | 
				
			||||||
            os.mkdir(profiledir)
 | 
					            os.mkdir(profiledir)
 | 
				
			||||||
            threadutil.setprofiledir(profiledir)
 | 
					            threadutil.setprofiledir(profiledir)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user