esc-reporting/esc-analyze.py  |    4 ++--
 esc-reporting/esc-automate.py |    4 ++--
 esc-reporting/esc-collect.py  |    2 +-
 esc-reporting/esc-report.py   |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 598368cdb35e886896a61ac7f3db7efc1c4f9432
Author: Shinnok <[email protected]>
Date:   Tue Oct 31 15:37:56 2017 +0100

    Change to: address for mentoring e-mails.
    
    From [email protected] to [email protected].
    
    Change-Id: I71e091f5d9950f5f0d9c6f3c27b0c30f41a02b80
    Reviewed-on: https://gerrit.libreoffice.org/44123
    Reviewed-by: Thorsten Behrens <[email protected]>
    Tested-by: Thorsten Behrens <[email protected]>

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index 458178e..ff83356 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -59,7 +59,7 @@ import re
 
 def util_errorMail(text):
     print(text)
-    sendMail = 'mail -r [email protected] ' + cfg['mail']['bcc'] + ' 
-s "ERROR: esc-analyze FAILED" [email protected] <<EOF\n' + text + 
'\nPlease have a look at vm174\nEOF\n'
+    sendMail = 'mail -r [email protected] ' + 
cfg['mail']['bcc'] + ' -s "ERROR: esc-analyze FAILED" 
[email protected] <<EOF\n' + text + '\nPlease have a look at 
vm174\nEOF\n'
     os.system(sendMail)
 
 
@@ -67,7 +67,7 @@ def util_errorMail(text):
 
 def util_errorMail(text):
     print(text)
-    sendMail = 'mail -r [email protected] -s "' + text + '" 
[email protected] <<EOF\nPlease have a look at vm174\nEOF\n'
+    sendMail = 'mail -r [email protected] -s "' + text + '" 
[email protected] <<EOF\nPlease have a look at vm174\nEOF\n'
     os.system(sendMail)
 
 
diff --git a/esc-reporting/esc-automate.py b/esc-reporting/esc-automate.py
index 2acfd97..15c39e5 100755
--- a/esc-reporting/esc-automate.py
+++ b/esc-reporting/esc-automate.py
@@ -34,7 +34,7 @@ from requests.auth import HTTPDigestAuth
 
 def util_errorMail(text):
     print(text)
-    sendMail = 'mail -r [email protected] ' + cfg['mail']['bcc'] + ' 
-s "ERROR: esc-automate FAILED" [email protected] <<EOF\n' + text + 
'\nPlease have a look at vm174\nEOF\n'
+    sendMail = 'mail -r [email protected] ' + 
cfg['mail']['bcc'] + ' -s "ERROR: esc-automate FAILED" 
[email protected] <<EOF\n' + text + '\nPlease have a look at 
vm174\nEOF\n'
     os.system(sendMail)
 
 
@@ -100,7 +100,7 @@ def doMail(mail, subject, content, attach=None):
       attach = '-a ' + attach + ' '
     else:
       attach = ''
-    sendMail = 'mail -r [email protected] ' + cfg['mail']['bcc'] + ' 
-s "' + subject + '" ' + attach + mail + ' <<EOF\n' + content + '\nEOF\n'
+    sendMail = 'mail -r [email protected] ' + 
cfg['mail']['bcc'] + ' -s "' + subject + '" ' + attach + mail + ' <<EOF\n' + 
content + '\nEOF\n'
     r = os.system(sendMail)
     if r != 0:
       raise Exception('mail failed')
diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index c573ce0..491fae4 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -43,7 +43,7 @@ from requests.auth import HTTPDigestAuth
 
 def util_errorMail(text):
     print(text)
-    sendMail = 'mail -r [email protected] ' + cfg['mail']['bcc'] + ' 
-s "ERROR: esc-collect FAILED" [email protected] <<EOF\n' + text + 
'\nPlease have a look at vm174\nEOF\n'
+    sendMail = 'mail -r [email protected] ' + 
cfg['mail']['bcc'] + ' -s "ERROR: esc-collect FAILED" 
[email protected] <<EOF\n' + text + '\nPlease have a look at 
vm174\nEOF\n'
     os.system(sendMail)
 
 
diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index 458fbf7..028e133 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -44,7 +44,7 @@ import xmltodict
 
 def util_errorMail(text):
     print(text)
-    sendMail = 'mail -r [email protected] ' + cfg['mail']['bcc'] + ' 
-s "ERROR: esc-report FAILED" [email protected] <<EOF\n' + text + 
'\nPlease have a look at vm174\nEOF\n'
+    sendMail = 'mail -r [email protected] ' + 
cfg['mail']['bcc'] + ' -s "ERROR: esc-report FAILED" 
[email protected] <<EOF\n' + text + '\nPlease have a look at 
vm174\nEOF\n'
     os.system(sendMail)
 
 
@@ -826,7 +826,7 @@ def runReport():
         attach = '-a ' + i['attach'] + ' '
       else:
         attach = ''
-      r = os.system("mail -r [email protected] " + cfg['mail']['bcc'] 
+ " -s '" + i['title'] + "' " + attach + i['mail'] + " <  " + i['file'])
+      r = os.system("mail -r [email protected] " + 
cfg['mail']['bcc'] + " -s '" + i['title'] + "' " + attach + i['mail'] + " <  " 
+ i['file'])
       if r != 0:
         util_errorMail('ERROR: mailing failed with ' + str(e))
 
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to