Patch from Dominic Hargreaves: call self.send_info_message instead of self.info_message.

[eoc.git] / eoc.py

diff --git a/eoc.py b/eoc.py
index ecb8dafccf99baa56699610ba0c5db5009a3cd7a..194d040f950e4acb54b6922036fd4486144ca857 100644 (file)
--- a/eoc.py
+++ b/eoc.py
@@ -4,7 +4,7 @@ This is a simple mailing list manager that mimicks the ezmlm-idx mail
 address commands. See manual page for more information.
 """
 
 address commands. See manual page for more information.
 """
 

-VERSION = "1.2.3"
+VERSION = "1.2.5"

 PLUGIN_INTERFACE_VERSION = "1"
 
 import getopt
 PLUGIN_INTERFACE_VERSION = "1"
 
 import getopt


@@ -80,6 +80,34 @@ COMMANDS = SIMPLE_COMMANDS + SUB_COMMANDS + HASH_COMMANDS
 def md5sum_as_hex(s):
     return md5.new(s).hexdigest()
 
 def md5sum_as_hex(s):
     return md5.new(s).hexdigest()
 

+
+def forkexec(argv, text):
+    """Run a command (given as argv array) and write text to its stdin"""
+    (r, w) = os.pipe()
+    pid = os.fork()
+    if pid == -1:
+        raise Exception("fork failed")
+    elif pid == 0:
+        os.dup2(r, 0)
+        os.close(r)
+        os.close(w)
+        fd = os.open("/dev/null", os.O_RDWR)
+        os.dup2(fd, 1)
+        os.dup2(fd, 2)
+        os.execvp(argv[0], argv)
+        sys.exit(1)
+    else:
+        os.close(r)
+        os.write(w, text)
+        os.close(w)
+        (pid2, exit) = os.waitpid(pid, 0)
+        if pid != pid2:
+            raise Exception("os.waitpid for %d returned for %d" % (pid, pid2))
+        if exit != 0:
+            raise Exception("subprocess failed, exit=0x%x" % exit)
+        return exit
+
+

 environ = None
 
 def set_environ(new_environ):
 environ = None
 
 def set_environ(new_environ):


@@ -411,14 +439,8 @@ class MailingListManager:
                     error("Error sending QMQP mail, mail probably not sent")
                     sys.exit(1)
             else:
                     error("Error sending QMQP mail, mail probably not sent")
                     sys.exit(1)
             else:

-                recipients = string.join(recipients, " ")
-                f = os.popen("%s -oi -f '%s' %s" % 
-                                 (self.sendmail, 
-                                  envelope_sender, 
-                                  recipients),
-                             "w")
-                f.write(text)
-                status = f.close()
+                status = forkexec([self.sendmail, "-oi", "-f", 
+                                   envelope_sender] + recipients, text)

                 if status:
                     error("%s returned %s, mail sending probably failed" %
                            (self.sendmail, status))
                 if status:
                     error("%s returned %s, mail sending probably failed" %
                            (self.sendmail, status))


@@ -529,7 +551,7 @@ class MailingList:
         
             return "\n".join(headers) + "\n\n" + body
         except:
         
             return "\n".join(headers) + "\n\n" + body
         except:

-            warning("Cannot MIME encode header, using original ones, sorry")
+            info("Cannot MIME encode header, using original ones, sorry")

             return text
 
     def template(self, template_name, dict):
             return text
 
     def template(self, template_name, dict):


@@ -635,7 +657,7 @@ class MailingList:
                                           "boundary": self.invent_boundary(),
                                        })
         else:
                                           "boundary": self.invent_boundary(),
                                        })
         else:

-            self.info_message([recipient], "setlist-sorry", {})
+            self.send_info_message([recipient], "setlist-sorry", {})

 
     def parse_setlist_addresses(self, text):
         body = text.split("\n\n", 1)[1]
 
     def parse_setlist_addresses(self, text):
         body = text.split("\n\n", 1)[1]