1.1 --- a/scripts/sendfiles.py Tue Jan 07 23:47:15 2014 +0100
1.2 +++ b/scripts/sendfiles.py Tue Jan 07 23:48:32 2014 +0100
1.3 @@ -1,6 +1,12 @@
1.4 -#!/usr/bin/env python
1.5 +# -*- coding: iso-8859-1 -*-
1.6 +"""
1.7 + sendfiles - Send files using MoinMessage
1.8
1.9 -from MoinMessage import Message, GPG, sendMessage
1.10 + @copyright: 2013, 2014 by Paul Boddie <paul@boddie.org.uk>
1.11 + @license: GNU GPL (v2 or later), see COPYING.txt for details.
1.12 +"""
1.13 +
1.14 +from MoinMessage import Message, GPG, sendMessage, timestamp
1.15 from email.mime.application import MIMEApplication
1.16 from os.path import split
1.17 import sys
1.18 @@ -40,14 +46,18 @@
1.19
1.20 # Get the e-mail message itself.
1.21
1.22 - message = message.get_payload()
1.23 + email_message = message.get_payload()
1.24
1.25 # Encrypt, sign and send the message.
1.26
1.27 gpg = GPG()
1.28 - message = gpg.encryptMessage(message, recipient)
1.29 - message = gpg.signMessage(message, signer)
1.30 - resp = sendMessage(message, url)
1.31 + encrypted_message = gpg.encryptMessage(email_message, recipient)
1.32 +
1.33 + timestamp(encrypted_message)
1.34 + encrypted_message["Update-Action"] = "store"
1.35 + message_to_send = gpg.signMessage(encrypted_message, signer)
1.36 +
1.37 + resp = sendMessage(message_to_send, url)
1.38
1.39 print resp
1.40