diff options
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 15 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/local.py | 13 |
2 files changed, 19 insertions, 9 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index d6ad3bb99a..9fec705ad6 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -525,6 +525,7 @@ class FetchData(object): self.localpath = None self.lockfile = None self.mirrortarball = None + self.basename = None (self.type, self.host, self.path, self.user, self.pswd, self.parm) = decodeurl(data.expand(url, d)) self.date = self.getSRCDate(d) self.url = url @@ -573,11 +574,10 @@ class FetchData(object): elif self.localfile: self.localpath = self.method.localpath(self.url, self, d) - if self.localfile and self.localpath: - # Note: These files should always be in DL_DIR whereas localpath may not be. - basepath = bb.data.expand("${DL_DIR}/%s" % os.path.basename(self.localpath), d) - self.donestamp = basepath + '.done' - self.lockfile = basepath + '.lock' + # Note: These files should always be in DL_DIR whereas localpath may not be. + basepath = bb.data.expand("${DL_DIR}/%s" % os.path.basename(self.localpath or self.basename), d) + self.donestamp = basepath + '.done' + self.lockfile = basepath + '.lock' def setup_localpath(self, d): if not self.localpath: @@ -913,9 +913,6 @@ class Fetch(object): m = ud.method localpath = "" - if not ud.localfile: - continue - lf = bb.utils.lockfile(ud.lockfile) try: @@ -951,7 +948,7 @@ class Fetch(object): mirrors = mirror_from_string(bb.data.getVar('MIRRORS', self.d, True)) localpath = try_mirrors (self.d, ud, mirrors) - if not localpath or not os.path.exists(localpath): + if not localpath or ((not os.path.exists(localpath)) and localpath.find("*") == -1): raise FetchError("Unable to fetch URL %s from any source." % u, u) if os.path.exists(ud.donestamp): diff --git a/bitbake/lib/bb/fetch2/local.py b/bitbake/lib/bb/fetch2/local.py index 77a296ec67..ed9a047d8d 100644 --- a/bitbake/lib/bb/fetch2/local.py +++ b/bitbake/lib/bb/fetch2/local.py @@ -40,6 +40,7 @@ class Local(FetchMethod): def urldata_init(self, ud, d): # We don't set localfile as for this fetcher the file is already local! + ud.basename = os.path.basename(ud.url.split("://")[1].split(";")[0]) return def localpath(self, url, urldata, d): @@ -49,6 +50,9 @@ class Local(FetchMethod): path = url.split("://")[1] path = path.split(";")[0] newpath = path + dldirfile = os.path.join(data.getVar("DL_DIR", d, True), os.path.basename(path)) + if os.path.exists(dldirfile): + return dldirfile if path[0] != "/": filespath = data.getVar('FILESPATH', d, True) if filespath: @@ -57,8 +61,17 @@ class Local(FetchMethod): filesdir = data.getVar('FILESDIR', d, True) if filesdir: newpath = os.path.join(filesdir, path) + if not os.path.exists(newpath) and path.find("*") == -1: + return dldirfile return newpath + def need_update(self, url, ud, d): + if url.find("*") == -1: + return False + if os.path.exists(ud.localpath): + return False + return True + def download(self, url, urldata, d): """Fetch urls (no-op for Local method)""" # no need to fetch local files, we'll deal with them in place. |