[oe-commits] org.oe.dev merge of '2d9bb3f1e645b23643eaf7cf8ccc4f31c1b84f21'

[koen commit]

merge of '2d9bb3f1e645b23643eaf7cf8ccc4f31c1b84f21'
     and '873dfa47c10fc80c1aefe1dd805391a01b9124b9'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 8feaf9690f0a2100128b1830f061fb71951fd3f4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8feaf9690f0a2100128b1830f061fb71951fd3f4
Files:
1
classes/seppuku.bbclass
packages/python/python-pygobject-native_2.12.2.bb
packages/python/python-pygobject_2.12.2.bb
packages/python/python-dbus/python-path.patch
packages/python/python-dbus_0.81.1.bb
Diffs:

#
# mt diff -r2d9bb3f1e645b23643eaf7cf8ccc4f31c1b84f21 -r8feaf9690f0a2100128b1830f061fb71951fd3f4
#
# 
# 
# patch "classes/seppuku.bbclass"
#  from [a69586a66f285bca06d5d46b92195f56ece0749d]
#    to [600990318f058b4d0322d76c901d7805b090a8c3]
# 
============================================================
--- classes/seppuku.bbclass	a69586a66f285bca06d5d46b92195f56ece0749d
+++ classes/seppuku.bbclass	600990318f058b4d0322d76c901d7805b090a8c3
@@ -335,16 +335,23 @@ python seppuku_eventhandler() {
         (bug_open, bug_number) = seppuku_find_bug_report(debug_file, opener, query, product, component, bugname)
         print >> debug_file, "Bug is open: %s and bug number: %s" % (bug_open, bug_number)
 
-        # The bug is present and still open, no need to attach an error log
+        # The bug is present and still open, attach an error log
         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):
+                     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)
+            else:
+                     print >> debug_file, "Not trying to create an attachment for bug #%s" % bug_number
             return NotHandled
 
         if bug_number and not bug_open:
             if not seppuku_reopen_bug(poster, reopen, product, component, bug_number, bugname, text):
-                print >> debug_file, "Failed to reopen the bug report"
+                print >> debug_file, "Failed to reopen the bug #%s" % bug_number
             else:
-                print >> debug_file, "Reopened the bug report"
+                print >> debug_file, "Reopened the bug #%s" % bug_number
         else:	
             bug_number = seppuku_file_bug(poster, newbug, product, component, bugname, text)
             if not bug_number:
@@ -354,11 +361,11 @@ python seppuku_eventhandler() {
 
         if bug_number and file:
             if not seppuku_create_attachment(debug_file, poster, attach, product, component, bug_number, text, file):
-                print >> debug_file, "Failed to attach the build log"
+                print >> debug_file, "Failed to attach the build log for bug #%" % bug_number
             else:
                 print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, component, bug_number)
         else:
-            print >> debug_file, "Not trying to create an attachment"
+            print >> debug_file, "Not trying to create an attachment for bug #%" % bug_number
 
     return NotHandled
 }


#
# mt diff -r873dfa47c10fc80c1aefe1dd805391a01b9124b9 -r8feaf9690f0a2100128b1830f061fb71951fd3f4
#
# 
# 
# delete "packages/python/python-pygobject-native_2.12.2.bb"
# 
# delete "packages/python/python-pygobject_2.12.2.bb"
# 
# add_file "packages/python/python-dbus/python-path.patch"
#  content [82cbc113e66f67ef9fac47fe70ef097309fe50e9]
# 
# patch "packages/python/python-dbus_0.81.1.bb"
#  from [5bfcd82edc7fda46c67b545945bde583f85b9f45]
#    to [f5cd93db72bf6173350f548037e52ecb2b42cd60]
# 
============================================================
--- packages/python/python-dbus/python-path.patch	82cbc113e66f67ef9fac47fe70ef097309fe50e9
+++ packages/python/python-dbus/python-path.patch	82cbc113e66f67ef9fac47fe70ef097309fe50e9
@@ -0,0 +1,21 @@
+--- dbus-python-0.81.1/m4.orig/am-check-python-headers.m4
++++ dbus-python-0.81.1/m4/am-check-python-headers.m4
+@@ -7214,12 +7214,18 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
++AC_ARG_WITH(python-includes,
++	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
++if test x$py_exec_prefix != x; then
++PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++else
+ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+ if test "$py_prefix" != "$py_exec_prefix"; then
+   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+ fi
++fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+ save_CPPFLAGS="$CPPFLAGS"
============================================================
--- packages/python/python-dbus_0.81.1.bb	5bfcd82edc7fda46c67b545945bde583f85b9f45
+++ packages/python/python-dbus_0.81.1.bb	f5cd93db72bf6173350f548037e52ecb2b42cd60
@@ -1,14 +1,18 @@ RDEPENDS = "dbus python-threading python
 DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
 SECTION = "devel/python"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
 RDEPENDS = "dbus python-threading python-io python-stringold python-logging"
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \
-           file://allow-older-autotools.patch;patch=1"
+           file://allow-older-autotools.patch;patch=1 \
+	   file://python-path.patch;patch=1"
+
 S = "${WORKDIR}/dbus-python-${PV}"
 
 inherit distutils-base autotools
 
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+