diff options
| -rwxr-xr-x | Mailman/MailList.py | 6 | ||||
| -rw-r--r-- | NEWS | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index 99cbbd2f..d1dc17a4 100755 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -634,6 +634,7 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, if e.errno <> errno.ENOENT: raise # The file doesn't exist yet return None, e + now = int(time.time()) try: try: dict = loadfunc(fp) @@ -645,8 +646,9 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, finally: fp.close() # Update the timestamp. We use current time here rather than mtime - # so the test above might succeed the next time. - self.__timestamp = int(time.time()) + # so the test above might succeed the next time. And we get the time + # before unpickling in case it takes more than a second. (LP: #266464) + self.__timestamp = now return dict, None def Load(self, check_version=True): @@ -23,6 +23,8 @@ Here is a history of user visible changes to Mailman. Bug fixes and other patches + - Enhanced the fix for race conditions in MailList().Load(). (LP: #266464) + - Fixed a typo in Utils.py that could have resulted in a NameError in logging an unlikely occurrence. (LP: #1637745) |