summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-08-29 21:49:22 -0400
committerMicah Anderson <micah@riseup.net>2013-08-29 21:49:22 -0400
commita42811da507c95715935be11543dff43e1c22a6d (patch)
tree0e629d25e5d4526a921cb9d4ad3d3bf3d3a30e6d
parent7e1c466dca61e1966626a2bfdc4a38889490d8d8 (diff)
parent26f5a1c8b1c85e85ea390cd10421d17ef2cc9118 (diff)
Merge remote-tracking branch 'chiiph/bug/save_doc' into debian
-rw-r--r--MANIFEST.in3
-rw-r--r--changes/bug_save_doc1
-rw-r--r--src/leap/mx/mail_receiver.py1
3 files changed, 5 insertions, 0 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 6bb33b5..3b96cd4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,6 @@
include data/*
include pkg/*
include pkg/utils/*
+include versioneer.py
+include LICENSE
+include CHANGELOG
diff --git a/changes/bug_save_doc b/changes/bug_save_doc
new file mode 100644
index 0000000..287228a
--- /dev/null
+++ b/changes/bug_save_doc
@@ -0,0 +1 @@
+ o Properly save the incoming mail as a doc in couch. \ No newline at end of file
diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py
index 77e7cf4..cabb5cb 100644
--- a/src/leap/mx/mail_receiver.py
+++ b/src/leap/mx/mail_receiver.py
@@ -168,6 +168,7 @@ class MailReceiver(Service):
uuid = 0
db = CouchDatabase(self._mail_couch_url, "user-%s" % (uuid,))
+ db.put_doc(doc)
log.msg("Done exporting")