Changeset 1100

Timestamp:

Sep 7, 2012 11:23:37 PM (10 years ago)

Author:

jemian

Message:

working on getting the mail to also work on Ubuntu

File:

• pvMail/src/PvMail/pvMail.py (modified) (1 diff)

pvMail/src/PvMail/pvMail.py

@@ -255 +255 @@
     global gui_object
     
-    email_program = '/usr/lib/sendmail'
     from_addr = sys.argv[0]
     to_addr = str(" ".join(recipients))
-    mailprogram = "%s -F %s -t %s" % (email_program, from_addr, to_addr)
-    mail_command = [mailprogram, "Subject: "+subject, message]
-    cmd = '''cat << +++ | %s\n+++''' % "\n".join(mail_command)
+
+    cmd = 'the mail configuration has not been set yet'
+    if 'el' in str(os.uname()):         # RHEL uses postfix
+        email_program = '/usr/lib/sendmail'
+        mail_command = "%s -F %s -t %s" % (email_program, from_addr, to_addr)
+        mail_message = [mail_command, "Subject: "+subject, message]
+        cmd = '''cat << +++ | %s\n+++''' % "\n".join(mail_message)
+    
+    if 'Ubuntu' in str(os.uname()):     # Ubuntu uses exim
+        email_program = '/usr/lib/sendmail'
+        # these commands aren't working!
+        mail_command = "%s -f %s %s" % (email_program, from_addr, to_addr)
+        mail_message = [mail_command, "Subject: "+subject, message]
+        cmd = '''cat << +++ | %s\n+++''' % "\n".join(mail_message)
 
     msg = "sending email to: %s" % to_addr