From: Chris Larson <clarson@mvista.com>
Date: Tue, 16 Jun 2009 17:32:23 +0000 (-0700)
Subject: distutils-common-base.bbclass: only raise missing python-native error if python-nativ... 
X-Git-Tag: Release-2010-05/1~2616^2~1^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=743aaf30cc10e1490bbc126cfe96f94695dca32c;p=openembedded.git

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

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

diff --git a/classes/distutils-common-base.bbclass b/classes/distutils-common-base.bbclass
index 9ca392b84a..01bf9eaeba 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)}"