diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-16 11:19:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-23 10:59:49 +0000 |
commit | ff7892fa808116acc1ac50effa023a4cb031a5fc (patch) | |
tree | eac5dc67571cdd0202f6f75017616ed29866caed /lib/bb/fetch2/repo.py | |
parent | cefb8c93c8299e68352cf7ec5ad9ca50c0d499ed (diff) | |
download | bitbake-ff7892fa808116acc1ac50effa023a4cb031a5fc.tar.gz |
lib/bb: Don't use deprecated bb.data.getVar/setVar API
The old style bb.data.getVar/setVar API is obsolete. Most of bitbake
doesn't use it but there were some pieces that escaped conversion. This
patch fixes the remaining users mostly in the fetchers.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/fetch2/repo.py')
-rw-r--r-- | lib/bb/fetch2/repo.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bb/fetch2/repo.py b/lib/bb/fetch2/repo.py index ecc6e68e9..bfd4ae16a 100644 --- a/lib/bb/fetch2/repo.py +++ b/lib/bb/fetch2/repo.py @@ -51,17 +51,17 @@ class Repo(FetchMethod): if not ud.manifest.endswith('.xml'): ud.manifest += '.xml' - ud.localfile = data.expand("repo_%s%s_%s_%s.tar.gz" % (ud.host, ud.path.replace("/", "."), ud.manifest, ud.branch), d) + ud.localfile = d.expand("repo_%s%s_%s_%s.tar.gz" % (ud.host, ud.path.replace("/", "."), ud.manifest, ud.branch)) def download(self, ud, d): """Fetch url""" - if os.access(os.path.join(data.getVar("DL_DIR", d, True), ud.localfile), os.R_OK): + if os.access(os.path.join(d.getVar("DL_DIR", True), ud.localfile), os.R_OK): logger.debug(1, "%s already exists (or was stashed). Skipping repo init / sync.", ud.localpath) return gitsrcname = "%s%s" % (ud.host, ud.path.replace("/", ".")) - repodir = data.getVar("REPODIR", d, True) or os.path.join(data.getVar("DL_DIR", d, True), "repo") + repodir = d.getVar("REPODIR", True) or os.path.join(d.getVar("DL_DIR", True), "repo") codir = os.path.join(repodir, gitsrcname, ud.manifest) if ud.user: |