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/clearcase.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/fetch2/clearcase.py') diff --git a/bitbake/lib/bb/fetch2/clearcase.py b/bitbake/lib/bb/fetch2/clearcase.py index 70e280a8dd..d35b2dabeb 100644 --- a/bitbake/lib/bb/fetch2/clearcase.py +++ b/bitbake/lib/bb/fetch2/clearcase.py @@ -110,7 +110,7 @@ class ClearCase(FetchMethod): ud.basecmd = d.getVar("FETCHCMD_ccrc", True) or spawn.find_executable("cleartool") or spawn.find_executable("rcleartool") - if data.getVar("SRCREV", d, True) == "INVALID": + if d.getVar("SRCREV", True) == "INVALID": raise FetchError("Set a valid SRCREV for the clearcase fetcher in your recipe, e.g. SRCREV = \"/main/LATEST\" or any other label of your choice.") ud.label = d.getVar("SRCREV", False) @@ -124,7 +124,7 @@ class ClearCase(FetchMethod): ud.viewname = "%s-view%s" % (ud.identifier, d.getVar("DATETIME", d, True)) ud.csname = "%s-config-spec" % (ud.identifier) - ud.ccasedir = os.path.join(data.getVar("DL_DIR", d, True), ud.type) + ud.ccasedir = os.path.join(d.getVar("DL_DIR", True), ud.type) ud.viewdir = os.path.join(ud.ccasedir, ud.viewname) ud.configspecfile = os.path.join(ud.ccasedir, ud.csname) ud.localfile = "%s.tar.gz" % (ud.identifier) @@ -144,7 +144,7 @@ class ClearCase(FetchMethod): self.debug("configspecfile = %s" % ud.configspecfile) self.debug("localfile = %s" % ud.localfile) - ud.localfile = os.path.join(data.getVar("DL_DIR", d, True), ud.localfile) + ud.localfile = os.path.join(d.getVar("DL_DIR", True), ud.localfile) def _build_ccase_command(self, ud, command): """ -- cgit v1.2.3-54-g00ecf