From: Stefan Stanacar <stefanx.stanacar@intel.com>
Date: Thu, 27 Feb 2014 15:42:07 +0000 (+0200)
Subject: build: filter out expanded empty strings for lockfiles flag
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7813e1bfd08cd48871f8c03cae2810265590105d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

build: filter out expanded empty strings for lockfiles flag

If we have something similar to:

    LOCKFILES = "${TMPDIR}/my.lock"
    LOCKFILES_qemuall = ""

    do_task[lockfiles] += "${LOCKFILES}"

when expanded, lockfiles will be empty for qemu, resulting in

     File "/home/stefans/yocto/poky/bitbake/lib/bb/utils.py", line 630, in mkdirhier
	raise e
    OSError: [Errno 2] No such file or directory: ''

This should filter out the empty expansions.

Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/build.py b/lib/bb/build.py
index 50a28dce7bd..52e41493c1a 100644
--- a/lib/bb/build.py
+++ b/lib/bb/build.py
@@ -173,7 +173,7 @@ def exec_func(func, d, dirs = None):
 
     lockflag = flags.get('lockfiles')
     if lockflag:
-        lockfiles = [d.expand(f) for f in lockflag.split()]
+        lockfiles = [f for f in d.expand(lockflag).split()]
     else:
         lockfiles = None