bitbake/codeparser: Deal with functions with trailing whitespace

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/bitbake/lib/bb/codeparser.py b/bitbake/lib/bb/codeparser.py
index 951bd47b88f40258798c9ec5c623837ac11053f8..7d40835cb845bc9cf6feab027a83f2066f85fcb3 100644 (file)
--- a/bitbake/lib/bb/codeparser.py
+++ b/bitbake/lib/bb/codeparser.py
@@ -15,7 +15,14 @@ except ImportError:
 def check_indent(codestr):
     """If the code is indented, add a top level piece of code to 'remove' the indentation"""
 
-    if codestr[0] is " " or codestr[0] is " ":
+    i = 0
+    while codestr[i] in ["\n", "       ", " "]:
+        i = i + 1
+
+    if i == 0:
+        return codestr
+
+    if codestr[i-1] is "       " or codestr[i-1] is " ":
         return "if 1:\n" + codestr        
 
     return codestr