[oe-commits] org.oe.dev merge of '0f8b09e59a3ffe93fca2a32d5d27746f0c582cd4'

[oe commit]

merge of '0f8b09e59a3ffe93fca2a32d5d27746f0c582cd4'
     and '495d10204bc69808fdd0046f98503c0240e1ebf7'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 3fd670a9d6af6eed9153e0d6149667628932294e
ViewMTN: http://monotone.openembedded.org/revision/info/3fd670a9d6af6eed9153e0d6149667628932294e
Files:
1
classes/seppuku.bbclass
packages/omniorb/omniorb_4.0.7.bb
Diffs:

#
# mt diff -r0f8b09e59a3ffe93fca2a32d5d27746f0c582cd4 -r3fd670a9d6af6eed9153e0d6149667628932294e
#
#
#
# patch "classes/seppuku.bbclass"
#  from [02ec3fae44701d38816aa59eb3db7429e3f666bc]
#    to [dea90de0839b4319cddfd278ce07f7f46f244309]
#
============================================================
--- classes/seppuku.bbclass	02ec3fae44701d38816aa59eb3db7429e3f666bc
+++ classes/seppuku.bbclass	dea90de0839b4319cddfd278ce07f7f46f244309
@@ -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,6 +246,7 @@ 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
@@ -351,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)
@@ -372,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)


#
# mt diff -r495d10204bc69808fdd0046f98503c0240e1ebf7 -r3fd670a9d6af6eed9153e0d6149667628932294e
#
#
#
# patch "packages/omniorb/omniorb_4.0.7.bb"
#  from [7ab7727701bbc02d4708ba95af2fec46715d2e11]
#    to [1825dd0df0437c7f815719babd1cbe11d38c2952]
#
============================================================
--- packages/omniorb/omniorb_4.0.7.bb	7ab7727701bbc02d4708ba95af2fec46715d2e11
+++ packages/omniorb/omniorb_4.0.7.bb	1825dd0df0437c7f815719babd1cbe11d38c2952
@@ -15,6 +15,8 @@ S = "${WORKDIR}/omniORB-${PV}"
 
 S = "${WORKDIR}/omniORB-${PV}"
 
+FILES_${PN}-dev += "${datadir}/idl/omniORB/* ${datadir}/idl/omniORB/cos/*
+
 inherit autotools pkgconfig
 
 do_compile () {