From: Koen Kooi <koen@openembedded.org>
Date: Mon, 17 May 2010 08:30:06 +0000 (+0200)
Subject: ti-devshell: fix method conflict
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90fc51ebe1c85b8c539dcb3a62e44933b74b1649;p=openembedded.git

ti-devshell: fix method conflict
---

diff --git a/recipes/ti/ti-devshell.bb b/recipes/ti/ti-devshell.bb
index 610a79ba52..3b9dcc8563 100644
--- a/recipes/ti/ti-devshell.bb
+++ b/recipes/ti/ti-devshell.bb
@@ -10,7 +10,7 @@ do_configure() {
 	:
 }
 
-def devshell_emit_env(o, d, all=False, funcwhitelist=None):
+def tidevshell_emit_env(o, d, all=False, funcwhitelist=None):
     """Emits all items in the data store in a format such that it can be sourced by a shell."""
 
     env = bb.data.keys(d)
@@ -41,7 +41,7 @@ python do_compile() {
 	f = open(shellfile, "w")
 
 	# emit variables and shell functions
-        devshell_emit_env(f, d, False, ["die", "oe", "autotools_do_configure"])
+        tidevshell_emit_env(f, d, False, ["die", "oe", "autotools_do_configure"])
 
 	f.close()
 }