From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 1 Jul 2010 22:54:13 +0000 (+0100)
Subject: bitbake: Fix handling of empty variables in local config files
X-Git-Tag: 2011-1~5456
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=14df5714866dcb1b0b93fc9e30dffb4931127de9;p=openembedded-core.git

bitbake: Fix handling of empty variables in local config files

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

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 7fbfb5beb5..488bc610d2 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -550,7 +550,7 @@ class BBCooker:
                     for key in data.dict:
                         if key != "_data":
                             value = data.getVar(key, False)
-                            if "${LAYERDIR}" in value:
+                            if value and "${LAYERDIR}" in value:
                                 data.setVar(key, value.replace("${LAYERDIR}", layer))
 
                 bb.data.delVar('LAYERDIR', data)