You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2016/07/13 11:36:52 UTC
[1/3] incubator-ponymail git commit: Generate a 10-tuple when date
parsing fails
Repository: incubator-ponymail
Updated Branches:
refs/heads/0.9 9881edb4f -> 116797982
Generate a 10-tuple when date parsing fails
Currently, we are only generating a 9-tuple, which causes
mktime_tz to fail. This fixes it by appending a (fake) TZ
to the tuple.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/c20fc79b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/c20fc79b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/c20fc79b
Branch: refs/heads/0.9
Commit: c20fc79bc971d743bc62e1b241c412277d254442
Parents: 000c8b7
Author: Daniel Gruno <hu...@apache.org>
Authored: Wed Jul 13 11:30:47 2016 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Wed Jul 13 11:30:47 2016 +0200
----------------------------------------------------------------------
tools/archiver.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/c20fc79b/tools/archiver.py
----------------------------------------------------------------------
diff --git a/tools/archiver.py b/tools/archiver.py
index 36b9227..b3e87d8 100644
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -270,7 +270,8 @@ class Archiver(object):
mdate = email.utils.parsedate_tz(msg_metadata.get('archived-at'))
elif not mdate:
print("Date seems totally wrong, setting to _now_ instead.")
- mdate = time.gmtime()
+ mdate = time.gmtime() # Get a standard 9-tuple
+ mdate = mdate + (0, ) # Fake a TZ (10th element)
mdatestring = time.strftime("%Y/%m/%d %H:%M:%S", time.gmtime(email.utils.mktime_tz(mdate)))
body = self.msgbody(msg)
try:
[2/3] incubator-ponymail git commit: find List ID if not passed
Posted by hu...@apache.org.
find List ID if not passed
import-mbox doesn't seem to pass List ID unless
specified via CLI. Make compute_updates determine
it if not set.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/205ce05b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/205ce05b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/205ce05b
Branch: refs/heads/0.9
Commit: 205ce05bf89539803425d45facd46c44c9b9c6f3
Parents: c20fc79
Author: Daniel Gruno <hu...@apache.org>
Authored: Wed Jul 13 13:29:31 2016 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Wed Jul 13 13:29:31 2016 +0200
----------------------------------------------------------------------
tools/archiver.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/205ce05b/tools/archiver.py
----------------------------------------------------------------------
diff --git a/tools/archiver.py b/tools/archiver.py
index b3e87d8..d8efc5f 100644
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -232,7 +232,8 @@ class Archiver(object):
"""
ojson = None
-
+ if not lid:
+ lid= msg.get('list-id')
if self.cropout:
crops = self.cropout.split(" ")
# Regex replace?
[3/3] incubator-ponymail git commit: Merge remote-tracking branch
'origin/master' into 0.9
Posted by hu...@apache.org.
Merge remote-tracking branch 'origin/master' into 0.9
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/11679798
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/11679798
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/11679798
Branch: refs/heads/0.9
Commit: 116797982cec1e483349ed48a397e0b0cdad5b1d
Parents: 9881edb 205ce05
Author: Daniel Gruno <hu...@apache.org>
Authored: Wed Jul 13 13:36:19 2016 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Wed Jul 13 13:36:19 2016 +0200
----------------------------------------------------------------------
tools/archiver.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------