[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  0234e3a Revert "autobuild: Return the last 50 log lines"
      from  fb381d8 torture: Fix the O3 developer build

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0234e3ac93fbfe1e74f1888599318084a749202d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Mar 23 11:07:08 2016 +0100

    Revert "autobuild: Return the last 50 log lines"
    
    This reverts commit aab2f39bb7ff330fbb01da4021c096e69a429d2e.
    
    This breaks if log_base is an https url...
    
    Traceback (most recent call last):
      File "script/autobuild.py", line 744, in <module>
        elapsed_time, log_base=options.log_base)
      File "script/autobuild.py", line 608, in email_failure
        f = open("%s/%s.stdout" % (log_base, failed_tag), 'r')
    IOError: [Errno 2] No such file or directory:
    'https://git.samba.org/uri/samba-autobuild/ctdb.stdout'
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Wed Mar 23 18:59:17 CET 2016 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 script/autobuild.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/script/autobuild.py b/script/autobuild.py
index 13be1b6..4cad920 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -566,7 +566,7 @@ def send_email(subject, text, log_tar):
     s.quit()
 
 def email_failure(status, failed_task, failed_stage, failed_tag, errstr,
-                  elapsed_time, log_base=None, add_log_tail=True):
+                  elapsed_time, log_base=None):
     '''send an email to options.email about the failure'''
     elapsed_minutes = elapsed_time / 60.0
     user = os.getenv("USER")
@@ -604,17 +604,6 @@ The top commit for the tree that was built was:
 
 ''' % (log_base, failed_tag, log_base, failed_tag, log_base, top_commit_msg)
 
-    if add_log_tail:
-        f = open("%s/%s.stdout" % (log_base, failed_tag), 'r')
-        log_tail = "".join(f.readlines()[-50:])
-
-        text += '''
-The last 50 lines of log messages:
-
-%s
-    ''' % log_tail
-        f.close()
-
     logs = os.path.join(gitroot, 'logs.tar.gz')
     send_email('autobuild failure on %s for task %s during %s'
                % (platform.node(), failed_task, failed_stage),


-- 
Samba Shared Repository