[oe-commits] org.oe.angstrom-2007.12-stable seppuku: backport log description changes

[koen commit]

seppuku: backport log description changes

applied changes from 7a3257112a3f6876d6a4ac71e945769cf4b6c2c2
             through 219fa4485d47101df96e2d47c358fe5617f1f2d8

applied changes from 7bf3ddcba37e60f65ee490010fa2b5a941510de0
             through 495d10204bc69808fdd0046f98503c0240e1ebf7

Author: koen at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: fab5808707a0fa100427a7086006de25bec2f6dd
ViewMTN: http://monotone.openembedded.org/revision/info/fab5808707a0fa100427a7086006de25bec2f6dd
Files:
1
BACKPORTS.txt
classes/seppuku.bbclass
Diffs:

#
# mt diff -r471138328584f00d6964a797dd16bf56c9b634a8 -rfab5808707a0fa100427a7086006de25bec2f6dd
#
#
#
# patch "BACKPORTS.txt"
#  from [3259797410093c3fa544fa5bdca9fe51243392dd]
#    to [9c4d028f3810c8f356c766de8559df72edfc1503]
# 
# patch "classes/seppuku.bbclass"
#  from [cf5cdec1dbfae0f2d217237b1a1d6a324976a740]
#    to [2e4ed7154198cf9572934d22f734e8c907c9318a]
#
============================================================
--- BACKPORTS.txt	3259797410093c3fa544fa5bdca9fe51243392dd
+++ BACKPORTS.txt	9c4d028f3810c8f356c766de8559df72edfc1503
@@ -214,3 +214,7 @@
 
 
 3ba9bb700e2671c899e7dd7c9cb3fd8bff810325 add debug package for 85 files with hardcoded PACKAGES definition.  Partly fixes 2471. (PaulS, Koen)
+219fa4485d47101df96e2d47c358fe5617f1f2d8 seppuku fixes (Koen, PaulS)
+495d10204bc69808fdd0046f98503c0240e1ebf7  "
+
+
============================================================
--- classes/seppuku.bbclass	cf5cdec1dbfae0f2d217237b1a1d6a324976a740
+++ classes/seppuku.bbclass	2e4ed7154198cf9572934d22f734e8c907c9318a
@@ -228,7 +228,7 @@ def seppuku_file_bug(poster, file, produ
     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, pos
         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)