summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-26 17:50:37 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:34:38 +0000
commitd01042eda955a855c7bd1a80a104f8cc2c6abf0c (patch)
tree9f83ccc603325e1cf040bd3b1bcc8f21d9d504cc /bitbake
parentab7b7bf94da653121baf7b1f6de9f11c8d4987e8 (diff)
downloadpoky-d01042eda955a855c7bd1a80a104f8cc2c6abf0c.tar.gz
bitbake: fetch2/__init__.py: Error if lockfile path invalid
Rather than create ".lock" and ".done" files with no name, error, forcing us to fix the cases where this is a problem. (Bitbake rev: 81158071508cc68c39db7d501370872f44d335cc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 5f0e6c9266..11fe95b541 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -1188,8 +1188,11 @@ class FetchData(object):
1188 basepath = self.localpath 1188 basepath = self.localpath
1189 elif self.localpath: 1189 elif self.localpath:
1190 basepath = dldir + os.sep + os.path.basename(self.localpath) 1190 basepath = dldir + os.sep + os.path.basename(self.localpath)
1191 else: 1191 elif self.basepath or self.basename:
1192 basepath = dldir + os.sep + (self.basepath or self.basename) 1192 basepath = dldir + os.sep + (self.basepath or self.basename)
1193 else:
1194 bb.fatal("Can't determine lock path for url %s" % url)
1195
1193 self.donestamp = basepath + '.done' 1196 self.donestamp = basepath + '.done'
1194 self.lockfile = basepath + '.lock' 1197 self.lockfile = basepath + '.lock'
1195 1198