diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-08-23 19:22:52 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2006-08-23 19:22:52 +0000 |
| commit | 68be6099dd326f7e48422cf3cacab6433b360260 (patch) | |
| tree | b8b37a1bf6e094fc401ef5ad1df79bcba8b2d250 /classes/tinderclient.bbclass | |
| parent | 75470578abf41b1632fb7f6f8afac646f438b82f (diff) | |
| parent | 488bf9ffaebb63ff512f09129791988ba5a1edfd (diff) | |
merge of 2694ea866aead6f6639b0c69c13127c90f95e5ff
and c02b3cdfadfa7f433fd5ca7a0ffcb6f329cadbaf
Diffstat (limited to 'classes/tinderclient.bbclass')
| -rw-r--r-- | classes/tinderclient.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 1c8079ebc9..d36ef0b343 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -240,8 +240,8 @@ def tinder_tinder_start(d, event): output.append( "---> TINDERBOX BUILDING '%(packages)s'" ) output.append( "<--- TINDERBOX STARTING BUILD NOW" ) - output.append( "" ) - + output.append( "" ) + return "\n".join(output) % vars() def tinder_do_tinder_report(event): @@ -311,13 +311,13 @@ def tinder_do_tinder_report(event): elif name == "TaskFailed": log += "<--- TINDERBOX Task %s failed (FAILURE)\n" % event.task elif name == "PkgStarted": - log += "---> TINDERBOX Package %s started\n" % data.getVar('P', event.data, True) + log += "---> TINDERBOX Package %s started\n" % data.getVar('PF', event.data, True) elif name == "PkgSucceeded": - log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('P', event.data, True) + log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('PF', event.data, True) elif name == "PkgFailed": if not data.getVar('TINDER_AUTOBUILD', event.data, True) == "0": build.exec_task('do_clean', event.data) - log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('P', event.data, True) + log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('PF', event.data, True) status = 200 # remember the failure for the -k case h = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') |