summaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r--meta/classes/base.bbclass10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 42291557b0..d8efcc0f8c 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -245,7 +245,7 @@ python base_do_unpack() {
245 localdata = bb.data.createCopy(d) 245 localdata = bb.data.createCopy(d)
246 bb.data.update_data(localdata) 246 bb.data.update_data(localdata)
247 247
248 urldata = bb.fetch.init([], localdata, True) 248 urldata = bb.fetch.init([], localdata)
249 249
250 src_uri = bb.data.getVar('SRC_URI', localdata, True) 250 src_uri = bb.data.getVar('SRC_URI', localdata, True)
251 if not src_uri: 251 if not src_uri:
@@ -258,7 +258,10 @@ python base_do_unpack() {
258 if local is None: 258 if local is None:
259 continue 259 continue
260 local = os.path.realpath(local) 260 local = os.path.realpath(local)
261 lf = bb.utils.lockfile(urldata[url].lockfile) 261 lockfile = urldata[url].lockfile
262 if lockfile:
263 lf = bb.utils.lockfile(urldata[url].lockfile)
264
262 if bb.fetch.__version__ == "1": 265 if bb.fetch.__version__ == "1":
263 ret = oe_unpack_file(local, localdata, url) 266 ret = oe_unpack_file(local, localdata, url)
264 else: 267 else:
@@ -266,7 +269,8 @@ python base_do_unpack() {
266 ud = urldata[url] 269 ud = urldata[url]
267 rootdir = bb.data.getVar('WORKDIR', localdata, True) 270 rootdir = bb.data.getVar('WORKDIR', localdata, True)
268 ret = ud.method.unpack(ud, rootdir, localdata) 271 ret = ud.method.unpack(ud, rootdir, localdata)
269 bb.utils.unlockfile(lf) 272 if lockfile:
273 bb.utils.unlockfile(lf)
270 if not ret: 274 if not ret:
271 raise bb.build.FuncFailed("oe_unpack_file failed with return value %s" % ret) 275 raise bb.build.FuncFailed("oe_unpack_file failed with return value %s" % ret)
272} 276}