[oe-commits] Chris Larson : distutils-common-base.bbclass: only raise missing python-native error if python-native isn't in DEPENDS.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 743aaf30cc10e1490bbc126cfe96f94695dca32c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=743aaf30cc10e1490bbc126cfe96f94695dca32c

Author: Chris Larson <clarson at mvista.com>
Date:   Tue Jun 16 10:32:23 2009 -0700

distutils-common-base.bbclass: only raise missing python-native error if python-native isn't in DEPENDS.

Signed-off-by: Chris Larson <clarson at mvista.com>
Acked-by: Michael 'Mickey' Lauer <mlauer at vanille-media.de>

---

 classes/distutils-common-base.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/classes/distutils-common-base.bbclass b/classes/distutils-common-base.bbclass
index 9ca392b..01bf9ea 100644
--- a/classes/distutils-common-base.bbclass
+++ b/classes/distutils-common-base.bbclass
@@ -8,7 +8,9 @@ def python_dir(d):
 	staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
 	for majmin in "2.6 2.5 2.4 2.3".split():
 		if os.path.exists( "%s/python%s" % ( staging_incdir, majmin ) ): return "python%s" % majmin
-	raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
+	if not "python-native" in bb.data.getVar( "DEPENDS", d, 1 ).split():
+		raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
+	return "INVALID"
 
 PYTHON_DIR = "${@python_dir(d)}"