[Libreoffice-commits] buildbot.git: 2 commits - tb/tb tb/tb_internals.sh

[Thorsten Behrens]

 tb/tb              |    2 +-
 tb/tb_internals.sh |   13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 3c4104a4e105419a05a6be35412a3725b2dceafd
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Wed May 20 17:38:18 2015 +0200

    Make tb email setup actually different for author/debug/all settings.
    
    Fixing a likely typo here.

diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index e2a471f..66f8a46 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -791,9 +791,9 @@ tinderbox: END
         subject="tinderbox gzipped logfile"
     fi
 
-    if [ "$SEND_MAIL" = "debug" ] ; then
+    if [ "$tb_SEND_MAIL" = "debug" ] ; then
         echo "$message_content" | send_mail_msg "${TB_OWNER?}" "${subject?}" "${xtinder?}" '' "${gzlog}"
-    elif [ "$SEND_MAIL" = "author" ] ; then
+    elif [ "$tb_SEND_MAIL" = "author" ] ; then
         echo "$message_content" | send_mail_msg "${TB_OWNER?}" "${subject?}" "${xtinder?}" '' "${gzlog}"
         if [ -n "${tb_BRANCH_AUTHOR}" ] ; then
             echo "$message_content" | send_mail_msg "${tb_BRANCH_AUTHOR}" "${subject?}" "${xtinder?}" '' "${gzlog}"
commit d74faebc3b50f8af931626ee8815046167e147e4
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Wed May 20 17:37:47 2015 +0200

    Make TLS use configurable from tb config.

diff --git a/tb/tb b/tb/tb
index fe65762..4fbae7a 100755
--- a/tb/tb
+++ b/tb/tb
@@ -165,7 +165,7 @@ TB_POST_BUILD_DELAY=<num_of_seconds> Pause in second after a build.
                                      G Level parameter
 TB_SMTP_HOST=<smtp_hostname> Hostname of the smtp server to use to send email.
                              This paramter is mandatory in tb mode
-
+TB_SMTP_TLS=<auto|yes|no> Email TLS mode - auto-detect, enforce, or switch-off.
 TB_SMTP_PASSWORD=<password> Password associated with TB_SMTP_USER.
                             This paramter is mandatory if TB_SMTP_USER is specified
 TB_SMTP_USER=<username> Username to login to the smtp server.
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 11aef67..e2a471f 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -1170,15 +1170,18 @@ send_mail_msg()
     if [ -n "${TB_SMTP_USER}" ] ; then
         smtp_auth="-xu ${TB_SMTP_USER?} -xp ${TB_SMTP_PASSWORD?}"
     fi
+    if [ -n "${TB_SMTP_TLS}" ] ; then
+        smtp_tls="-o tls=${TB_SMTP_TLS?}"
+    fi
 
     [ $V ] && log_msgs "send mail to ${to?} with subject \"${subject?}\""
     [ $V ] && quiet=""
     if [ -n "${log}" ] ; then
-        ${tb_BIN_DIR?}/tb_send_email $quiet -f "${TB_OWNER?}" -s "${TB_SMTP_HOST?}" $smtp_auth -t "${to?}" -bcc "${bcc?}" -u "${subject?}" -o "message-header=${headers?}" -a "${log?}"
+        ${tb_BIN_DIR?}/tb_send_email $quiet -f "${TB_OWNER?}" -s "${TB_SMTP_HOST?}" $smtp_auth $smtp_tls -t "${to?}" -bcc "${bcc?}" -u "${subject?}" -o "message-header=${headers?}" -a "${log?}"
     elif [ -n "${headers?}" ] ; then
-        ${tb_BIN_DIR?}/tb_send_email $quiet -f "${TB_OWNER?}" -s "${TB_SMTP_HOST?}" $smtp_auth -t "${to?}" -bcc "${bcc?}" -u "${subject?}" -o "message-header=${headers?}"
+        ${tb_BIN_DIR?}/tb_send_email $quiet -f "${TB_OWNER?}" -s "${TB_SMTP_HOST?}" $smtp_auth $smtp_tls -t "${to?}" -bcc "${bcc?}" -u "${subject?}" -o "message-header=${headers?}"
     else
-        ${tb_BIN_DIR?}/tb_send_email $quiet -f "${TB_OWNER?}" -s "${TB_SMTP_HOST?}" $smtp_auth -t "${to?}" -bcc "${bcc?}" -u "${subject?}"
+        ${tb_BIN_DIR?}/tb_send_email $quiet -f "${TB_OWNER?}" -s "${TB_SMTP_HOST?}" $smtp_auth $smtp_tls -t "${to?}" -bcc "${bcc?}" -u "${subject?}"
     fi
 }