From: Mario Domenech Goulart <mario@ossystems.com.br>
Date: Wed, 15 Jul 2009 19:52:28 +0000 (-0300)
Subject: Avoids overwriting Python's built-in `str' in get_devtable_list
X-Git-Tag: Release-2010-05/1~2423
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55f42a3dd5b43c3ad4bb2425410f64a9e0dd924a;p=openembedded.git

Avoids overwriting Python's built-in `str' in get_devtable_list

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/classes/image.bbclass b/classes/image.bbclass
index f7afbab81e..f03a115388 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -72,13 +72,11 @@ def get_devtable_list(d):
     devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1)
     if devtable != None:
         return devtable
-    str = ""
     devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1)
     if devtables == None:
         devtables = 'files/device_table-minimal.txt'
-    for devtable in devtables.split():
-        str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
-    return str
+    return " ".join([ bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
+                      for devtable in devtables.split() ])
 
 def get_imagecmds(d):
     import bb