diff options
| author |   Koen Kooi <koen@openembedded.org> | 2008-03-17 14:07:51 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-03-17 14:07:51 +0000 |
| commit | 3c795f01739241914a6acfd493ae07d3824e93d9 (patch) | |
| tree | 686969307b96a4dd309a209e9f0030fbf7a7bacd | |
| parent | 7c56ac4e82edfb1fb092e8a18eb6e6574d970bd9 (diff) | |
| download | openembedded-3c795f01739241914a6acfd493ae07d3824e93d9.tar.gz | |
seppuku: backport log description changes
applied changes from 7a3257112a3f6876d6a4ac71e945769cf4b6c2c2
through 219fa4485d47101df96e2d47c358fe5617f1f2d8
applied changes from 7bf3ddcba37e60f65ee490010fa2b5a941510de0
through 495d10204bc69808fdd0046f98503c0240e1ebf7
| -rw-r--r-- | BACKPORTS.txt | 4 | ||||
| -rw-r--r-- | classes/seppuku.bbclass | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/BACKPORTS.txt b/BACKPORTS.txt index 02850a9f7c..8cc067ac33 100644 --- a/BACKPORTS.txt +++ b/BACKPORTS.txt @@ -214,3 +214,7 @@ a3b18a00a09e716f4b3d5bfced86fea0439953a0 h2200: load g_ether on boot (PaulS, Koe 3ba9bb700e2671c899e7dd7c9cb3fd8bff810325 add debug package for 85 files with hardcoded PACKAGES definition. Partly fixes 2471. (PaulS, Koen) +219fa4485d47101df96e2d47c358fe5617f1f2d8 seppuku fixes (Koen, PaulS) +495d10204bc69808fdd0046f98503c0240e1ebf7 " + + diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass index 3f2fc1a8b6..fb7ea605f7 100644 --- a/classes/seppuku.bbclass +++ b/classes/seppuku.bbclass @@ -228,7 +228,7 @@ def seppuku_file_bug(poster, file, product, component, bugname, text): else: return res[0] -def seppuku_create_attachment(debug, poster, attach_query, product, component, bug_number, text, file): +def seppuku_create_attachment(data, debug, poster, attach_query, product, component, bug_number, text, file): """ Create a new attachment for the failed report @@ -246,9 +246,11 @@ def seppuku_create_attachment(debug, poster, attach_query, product, component, b print >> debug, "Can't create an attachment, no attach_query passed to method" return False + import bb + logdescription = "Build log for machine %s" % (bb.data.getVar('MACHINE', data, True)) import urllib2 - param = { "bugid" : bug_number, "action" : "insert", "data" : file, "description" : "Build log", "ispatch" : "0", "contenttypemethod" : "list", "contenttypeselection" : "text/plain", "comment" : text } + param = { "bugid" : bug_number, "action" : "insert", "data" : file, "description" : logdescription, "ispatch" : "0", "contenttypemethod" : "list", "contenttypeselection" : "text/plain", "comment" : text } try: result = poster.open( attach_query, param ) @@ -350,7 +352,7 @@ python seppuku_eventhandler() { if bug_number and bug_open: print >> debug_file, "The bug is known as '%s'" % bug_number if file: - if not seppuku_create_attachment(debug_file, poster, attach, product, component, bug_number, text, file): + if not seppuku_create_attachment(data, debug_file, poster, attach, product, component, bug_number, text, file): print >> debug_file, "Failed to attach the build log for bug #%s" % bug_number else: print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, component, bug_number) @@ -371,7 +373,7 @@ python seppuku_eventhandler() { print >> debug_file, "The new bug_number: '%s'" % bug_number if bug_number and file: - if not seppuku_create_attachment(debug_file, poster, attach, product, component, bug_number, text, file): + if not seppuku_create_attachment(data, debug_file, poster, attach, product, component, bug_number, text, file): print >> debug_file, "Failed to attach the build log for bug #%s" % bug_number else: print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, component, bug_number) |