summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/build.py
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-04-20 11:53:31 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:34 +0100
commitc3eae29efa2318ee4f12b1e1c8d562e18d1cee87 (patch)
tree66adc15f52ffd35621389d9de05df3adf76a1f90 /bitbake/lib/bb/build.py
parent214d1f7433fd8571c3e0920624ce07f31c7f08c9 (diff)
downloadpoky-c3eae29efa2318ee4f12b1e1c8d562e18d1cee87.tar.gz
Don't try to expand non-string values
(Bitbake rev: fe36a726b9f930bbd6fd758c0aee78559e95f02b) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/build.py')
-rw-r--r--bitbake/lib/bb/build.py28
1 files changed, 15 insertions, 13 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 4f14e63ac7..1b1775f9db 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -99,18 +99,19 @@ def exec_func(func, d, dirs = None):
99 99
100 ispython = flags['python'] 100 ispython = flags['python']
101 101
102 cleandirs = (data.expand(flags['cleandirs'], d) or "").split() 102 cleandirs = flags['cleandirs']
103 for cdir in cleandirs: 103 if cleandirs:
104 os.system("rm -rf %s" % cdir) 104 for cdir in data.expand(cleandirs, d).split():
105 os.system("rm -rf %s" % cdir)
105 106
106 if dirs: 107 if dirs is None:
107 dirs = data.expand(dirs, d) 108 dirs = flags['dirs']
108 else: 109 if dirs:
109 dirs = (data.expand(flags['dirs'], d) or "").split() 110 dirs = data.expand(dirs, d).split()
110 for adir in dirs:
111 bb.utils.mkdirhier(adir)
112 111
113 if len(dirs) > 0: 112 if dirs:
113 for adir in dirs:
114 bb.utils.mkdirhier(adir)
114 adir = dirs[-1] 115 adir = dirs[-1]
115 else: 116 else:
116 adir = data.getVar('B', d, 1) 117 adir = data.getVar('B', d, 1)
@@ -157,9 +158,10 @@ def exec_func(func, d, dirs = None):
157 os.dup2(se.fileno(), ose[1]) 158 os.dup2(se.fileno(), ose[1])
158 159
159 locks = [] 160 locks = []
160 lockfiles = (data.expand(flags['lockfiles'], d) or "").split() 161 lockfiles = flags['lockfiles']
161 for lock in lockfiles: 162 if lockfiles:
162 locks.append(bb.utils.lockfile(lock)) 163 for lock in data.expand(lockfiles, d).split():
164 locks.append(bb.utils.lockfile(lock))
163 165
164 try: 166 try:
165 # Run the function 167 # Run the function