From 8de811ae76f8a5bc160e3e3f72da3a5e08b6ca1a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 16 Nov 2016 11:19:01 +0000 Subject: bitbake: 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. (Bitbake rev: ff7892fa808116acc1ac50effa023a4cb031a5fc) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/repo.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/fetch2/repo.py') diff --git a/bitbake/lib/bb/fetch2/repo.py b/bitbake/lib/bb/fetch2/repo.py index ecc6e68e97..bfd4ae16aa 100644 --- a/bitbake/lib/bb/fetch2/repo.py +++ b/bitbake/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: -- cgit v1.2.3-54-g00ecf