diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-11-30 10:32:25 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-11-30 10:32:25 +0900 |
| commit | 30cd100c152244d5b7a35c1142ae8b0c72428971 (patch) | |
| tree | 01632af6bdcab8e7ff9b3b1bbb5d188416bff344 /Mailman/MailList.py | |
| parent | be0b65acdeef0468d6bbf55cdec592990117e9d4 (diff) | |
| parent | 62c260510d4918841d320d1dfc760238e87b8af6 (diff) | |
| download | mailman2-30cd100c152244d5b7a35c1142ae8b0c72428971.tar.gz mailman2-30cd100c152244d5b7a35c1142ae8b0c72428971.tar.xz mailman2-30cd100c152244d5b7a35c1142ae8b0c72428971.zip | |
Merge lp:mailman/2.1 up to 1686
Diffstat (limited to 'Mailman/MailList.py')
| -rwxr-xr-x | Mailman/MailList.py | 6 |
1 files changed, 4 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): |