[oe-commits] Koen Kooi : ti-devshell: fix method conflict

[git version control]

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

Author: Koen Kooi <koen at openembedded.org>
Date:   Mon May 17 10:30:06 2010 +0200

ti-devshell: fix method conflict

---

 recipes/ti/ti-devshell.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/ti/ti-devshell.bb b/recipes/ti/ti-devshell.bb
index 610a79b..3b9dcc8 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()
 }