[oe-commits] org.oe.dev merge of '68653f0e949fe7055f2dc011744ee97ae437d2e8'

[rpurdie commit]

merge of '68653f0e949fe7055f2dc011744ee97ae437d2e8'
     and 'b3274bff48897f5f043f1256c823866ff6981f15'

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 049095b128b58f721f5cc384f734bec41578053e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=049095b128b58f721f5cc384f734bec41578053e
Files:
1
packages/binutils/binutils-cross.inc
classes/seppuku.bbclass
Diffs:

#
# mt diff -r68653f0e949fe7055f2dc011744ee97ae437d2e8 -r049095b128b58f721f5cc384f734bec41578053e
#
# 
# 
# patch "packages/binutils/binutils-cross.inc"
#  from [ac94886be7cf70af5bcb70e24af6ea89f0e0de8c]
#    to [2a9f9e4a843e43fc6356fa81e25f167e69bdd8d2]
# 
============================================================
--- packages/binutils/binutils-cross.inc	ac94886be7cf70af5bcb70e24af6ea89f0e0de8c
+++ packages/binutils/binutils-cross.inc	2a9f9e4a843e43fc6356fa81e25f167e69bdd8d2
@@ -6,7 +6,7 @@ EXTRA_OECONF = "--with-sysroot=${CROSS_D
 EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
 		--program-prefix=${TARGET_PREFIX} \
 		--enable-install-libbfd \
-		""
+		"
 
 do_stage () {
 	oe_runmake install


#
# mt diff -rb3274bff48897f5f043f1256c823866ff6981f15 -r049095b128b58f721f5cc384f734bec41578053e
#
# 
# 
# patch "classes/seppuku.bbclass"
#  from [7aca47c3d82b67562208c0117388a76d2139ecda]
#    to [edc9f058d5d6bdef59b45a60a154a2fb24d73b7f]
# 
============================================================
--- classes/seppuku.bbclass	7aca47c3d82b67562208c0117388a76d2139ecda
+++ classes/seppuku.bbclass	edc9f058d5d6bdef59b45a60a154a2fb24d73b7f
@@ -267,6 +267,13 @@ python seppuku_eventhandler() {
     from bb import data, mkdirhier, build
     import bb, os, glob
 
+    event = e
+    data = e.data
+    name = getName(event)
+    if name == "MsgNote":
+       # avoid recursion
+       return NotHandled
+
     # Try to load our exotic libraries
     try:
         import MultipartPostHandler
@@ -280,9 +287,6 @@ python seppuku_eventhandler() {
         bb.note("Failed to import the cookielib and urllib2, make sure to use python2.4")
         return NotHandled
 
-    event = e
-    data = e.data
-    name = getName(event)
     if name == "PkgFailed":
         if not bb.data.getVar('SEPPUKU_AUTOBUILD', data, True) == "0":
             build.exec_task('do_clean', data)