[Libreoffice-commits] buildbot.git: tb/tb_send_email

Norbert Thiebaud nthiebaud at gmail.com
Sat Jul 27 18:24:36 PDT 2013


 tb/tb_send_email |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2091b8be6462d3cb3de695d69d0d24a135f04384
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Jul 27 20:24:04 2013 -0500

    uname -o is not portable

diff --git a/tb/tb_send_email b/tb/tb_send_email
index 8a4fc03..841e6ed 100755
--- a/tb/tb_send_email
+++ b/tb/tb_send_email
@@ -1904,8 +1904,8 @@ else {
         printmsg("DEBUG => Starting TLS", 2);
         if (SMTPchat('STARTTLS')) { quit($conf{'error'}, 1); }
         my $ssl_ver = 'SSLv3 TLSv1';
-        chomp(my $system = `uname -o`);
-        if ($system eq 'Cygwin') { $ssl_ver = 'SSLv3'; }
+        chomp(my $system = `uname`);
+        if ($system =~ /CYGWIN/) { $ssl_ver = 'SSLv3'; }
         if (! IO::Socket::SSL->start_SSL($SERVER, SSL_version => $ssl_ver)) {
             quit("ERROR => TLS setup failed: " . IO::Socket::SSL::errstr(), 1);
         }


More information about the Libreoffice-commits mailing list