# HG changeset patch # User Paul Boddie # Date 1431437762 -7200 # Node ID 17368b3b782fee1d1aa14808ac1478293252e339 # Parent 57657aa6efdbe64e538e0ab491c3e5c8d6a7d171 Removed the superfluous computed recipient option from the processor. diff -r 57657aa6efdb -r 17368b3b782f conf/postfix/master.cf.items --- a/conf/postfix/master.cf.items Mon May 11 22:13:58 2015 +0200 +++ b/conf/postfix/master.cf.items Tue May 12 15:36:02 2015 +0200 @@ -1,9 +1,9 @@ imip_resources unix - n n - - pipe flags=FR user=imip-agent:lmtp argv=/var/lib/imip-agent/imip_resource.py - -o ${original_recipient} -r ${recipient} + -o ${original_recipient} imip_people unix - n n - - pipe flags=FR user=imip-agent:lmtp argv=/var/lib/imip-agent/imip_person.py - -o ${original_recipient} -r ${recipient} -l $lmtp_socket + -o ${original_recipient} -l $lmtp_socket imip_people_outgoing unix - n n - - pipe flags=FR user=imip-agent:lmtp argv=/var/lib/imip-agent/imip_person_outgoing.py -O diff -r 57657aa6efdb -r 17368b3b782f imiptools/__init__.py --- a/imiptools/__init__.py Mon May 11 22:13:58 2015 +0200 +++ b/imiptools/__init__.py Tue May 12 15:36:02 2015 +0200 @@ -56,11 +56,11 @@ self.messenger = messenger or Messenger() self.lmtp_socket = None - def process(self, f, original_recipients, recipients, outgoing_only): + def process(self, f, original_recipients, outgoing_only): """ Process content from the stream 'f' accompanied by the given - 'original_recipients' and 'recipients'. + 'original_recipients'. """ msg = message_from_file(f) @@ -253,8 +253,6 @@ if arg == "-o": l = original_recipients - elif arg == "-r": - l = recipients # Switch to collecting senders. @@ -275,7 +273,7 @@ self.messenger.sender = senders and senders[0] or self.messenger.sender self.lmtp_socket = lmtp and lmtp[0] or None - self.process(stream, original_recipients, recipients, outgoing_only) + self.process(stream, original_recipients, outgoing_only) def __call__(self):