diff options
| author |   Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:08 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:47:45 +0000 |
| commit | 3b45c479de8640f92dd1d9f147b02e1eecfaadc8 (patch) | |
| tree | ba0d71bdd8028442fd06002dc09e66ddf8291f6d /lib/bb/fetch2/local.py | |
| parent | 3cb0d1c78b4c2e4f251a59b86c8da583828ad08b (diff) | |
| download | bitbake-3b45c479de8640f92dd1d9f147b02e1eecfaadc8.tar.gz | |
bitbake: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/fetch2/local.py')
| -rw-r--r-- | lib/bb/fetch2/local.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/bb/fetch2/local.py b/lib/bb/fetch2/local.py index 5adfd5d44..83778883e 100644 --- a/lib/bb/fetch2/local.py +++ b/lib/bb/fetch2/local.py @@ -63,13 +63,13 @@ class Local(FetchMethod): newpath = path if path[0] == "/": return [path] - filespath = d.getVar('FILESPATH', True) + filespath = d.getVar('FILESPATH') if filespath: logger.debug(2, "Searching for %s in paths:\n %s" % (path, "\n ".join(filespath.split(":")))) newpath, hist = bb.utils.which(filespath, path, history=True) searched.extend(hist) if not newpath: - filesdir = d.getVar('FILESDIR', True) + filesdir = d.getVar('FILESDIR') if filesdir: logger.debug(2, "Searching for %s in path: %s" % (path, filesdir)) newpath = os.path.join(filesdir, path) @@ -81,7 +81,7 @@ class Local(FetchMethod): logger.debug(2, "Searching for %s in path: %s" % (path, newpath)) return searched if not os.path.exists(newpath): - dldirfile = os.path.join(d.getVar("DL_DIR", True), path) + dldirfile = os.path.join(d.getVar("DL_DIR"), path) logger.debug(2, "Defaulting to %s for %s" % (dldirfile, path)) bb.utils.mkdirhier(os.path.dirname(dldirfile)) searched.append(dldirfile) @@ -100,13 +100,13 @@ class Local(FetchMethod): # no need to fetch local files, we'll deal with them in place. if self.supports_checksum(urldata) and not os.path.exists(urldata.localpath): locations = [] - filespath = d.getVar('FILESPATH', True) + filespath = d.getVar('FILESPATH') if filespath: locations = filespath.split(":") - filesdir = d.getVar('FILESDIR', True) + filesdir = d.getVar('FILESDIR') if filesdir: locations.append(filesdir) - locations.append(d.getVar("DL_DIR", True)) + locations.append(d.getVar("DL_DIR")) msg = "Unable to find file " + urldata.url + " anywhere. The paths that were searched were:\n " + "\n ".join(locations) raise FetchError(msg) |