classes/tinderclient.bbclass:

    -do print less information
    -fix a nice issue with log that became
     an array due the readlines.

diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass
index d01bce1..3385fc0 100644 (file)
--- a/classes/tinderclient.bbclass
+++ b/classes/tinderclient.bbclass
@@ -84,7 +84,7 @@ def tinder_build_start(d):
 
     selector = url + "/xml/build_start.pl"
 
-    print "selector %s and url %s" % (selector, url)
+    #print "selector %s and url %s" % (selector, url)
 
     # now post it
     h = httplib.HTTP(server)
@@ -94,7 +94,7 @@ def tinder_build_start(d):
     h.endheaders()
     h.send(body)
     errcode, errmsg, headers = h.getreply()
-    print errcode, errmsg, headers
+    #print errcode, errmsg, headers
     report = h.file.read()
 
     # now let us find the machine id that was assigned to us
@@ -135,7 +135,6 @@ def tinder_send_http(d, status, log):
     h.send(body)
     errcode, errmsg, headers = h.getreply()
     print errcode, errmsg, headers
-    print h.file.read()
 
 
 def tinder_print_info(d):
@@ -161,6 +160,7 @@ def tinder_print_info(d):
     bbfiles = data.getVar( 'BBFILES', d, True )
     tarch   = data.getVar( 'TARGET_ARCH', d, True )
     fpu     = data.getVar( 'TARGET_FPU', d, True )
+    oerev   = data.getVar( 'OE_REVISION', d, True ) or "unknown"
 
     # there is a bug with tipple quoted strings
     # i will work around but will fix the original
@@ -184,6 +184,7 @@ def tinder_print_info(d):
     output.append("MACHINE = '%(machine)s'" )
     output.append("DISTRO = '%(distro)s'" )
     output.append("BBFILES = '%(bbfiles)s'" )
+    output.append("OE_REVISION = '%(oerev)s'" )
     output.append("== End Tinderbox Client Info" )
 
     # now create the real output
@@ -203,7 +204,8 @@ def tinder_print_env():
     # build the environment
     env = ""
     for var in os.environ:
-        env += "%s=%s\n" % (var, os.environ[var])
+       print var, os.environ[var]
+        env += "%s=%s\n" % (var, os.environ[var] or "")
 
     output = []
     output.append( "---> TINDERBOX RUNNING env %(time_start)s" )
@@ -219,14 +221,15 @@ def tinder_tinder_start(d):
 
     time_start = tinder_time_string()
     config = tinder_print_info(d)
-    env    = tinder_print_env()
+    #env    = tinder_print_env()
     time_end   = tinder_time_string()
 
     output = []
     output.append( "---> TINDERBOX PRINTING CONFIGURATION %(time_start)s" )
     output.append( config )
-    output.append( env    )
+    #output.append( env    )
     output.append( "<--- TINDERBOX FINISHED PRINTING CONFIGURATION %(time_end)s" )
+    output.append( "" )
     return "\n".join(output) % vars()
 
 def tinder_do_tinder_report(event):
@@ -269,22 +272,21 @@ def tinder_do_tinder_report(event):
         log_file = glob.glob("%s/log.%s.*" % (data.getVar('T', event.data, True), event.task))
 
         if len(log_file) != 0:
-            to_file  = data.getVar('TINDER_LOG', event.data, True)
-            log      = open(log_file[0], 'r').readlines()
+            log      = "\n".join( open(log_file[0], 'r').readlines() )
 
     # set the right 'HEADER'/Summary for the TinderBox
     if name == "TaskStarted":
-        log += "--> TINDERBOX Task %s started" % event.task
+        log += "---> TINDERBOX Task %s started\n" % event.task
     elif name == "TaskSucceeded":
-        log += "<-- TINDERBOX Task %s done (SUCCESS)" % event.task
+        log += "<--- TINDERBOX Task %s done (SUCCESS)\n" % event.task
     elif name == "TaskFailed":
-        log += "<-- TINDERBOX Task %s failed (FAILURE)" % event.task
+        log += "<--- TINDERBOX Task %s failed (FAILURE)\n" % event.task
     elif name == "PkgStarted":
-        log += "--> TINDERBOX Package %s started" % data.getVar('P', event.data, True)
+        log += "---> TINDERBOX Package %s started\n" % data.getVar('P', event.data, True)
     elif name == "PkgSucceeded":
-        log += "<-- TINDERBOX Package %s done (SUCCESS)" % data.getVar('P', event.data, True)
+        log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('P', event.data, True)
     elif name == "PkgFailed":
-        log += "<-- TINDERBOX Package %s failed (FAILURE)" % data.getVar('P', event.data, True)
+        log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('P', event.data, True)
         status = 200
     elif name == "BuildCompleted":
         status = 100