diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 23:29:51 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-06 23:13:25 +0000 |
commit | 4fb028b0bd14d3e4b3fd7a89c643528728566476 (patch) | |
tree | a629f752a444670c1461ea8ca46da5faa652dfd8 /lib/bb/fetch2 | |
parent | 2e25d09a1ab62ccc3573d13114d59838cf4b07f2 (diff) | |
download | openembedded-core-contrib-4fb028b0bd14d3e4b3fd7a89c643528728566476.tar.gz |
fetch2/osc: Clean up old variable syntax
Since people do copy and paste these things, clean up old syntax styles.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/fetch2')
-rw-r--r-- | lib/bb/fetch2/osc.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/bb/fetch2/osc.py b/lib/bb/fetch2/osc.py index 3dfa2a7a72..d051dfdafa 100644 --- a/lib/bb/fetch2/osc.py +++ b/lib/bb/fetch2/osc.py @@ -34,13 +34,13 @@ class Osc(FetchMethod): # Create paths to osc checkouts relpath = self._strip_leading_slashes(ud.path) - ud.pkgdir = os.path.join(data.expand('${OSCDIR}', d), ud.host) + ud.pkgdir = os.path.join(d.getVar('OSCDIR', True), ud.host) ud.moddir = os.path.join(ud.pkgdir, relpath, ud.module) if 'rev' in ud.parm: ud.revision = ud.parm['rev'] else: - pv = data.getVar("PV", d, 0) + pv = d.getVar("PV", False) rev = bb.fetch2.srcrev_internal_helper(ud, d) if rev and rev != True: ud.revision = rev @@ -84,7 +84,7 @@ class Osc(FetchMethod): logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'") - if os.access(os.path.join(data.expand('${OSCDIR}', d), ud.path, ud.module), os.R_OK): + if os.access(os.path.join(d.getVar('OSCDIR', True), ud.path, ud.module), os.R_OK): oscupdatecmd = self._buildosccommand(ud, d, "update") logger.info("Update "+ ud.url) # update sources there @@ -114,7 +114,7 @@ class Osc(FetchMethod): Generate a .oscrc to be used for this run. """ - config_path = os.path.join(data.expand('${OSCDIR}', d), "oscrc") + config_path = os.path.join(d.getVar('OSCDIR', True), "oscrc") if (os.path.exists(config_path)): os.remove(config_path) @@ -123,7 +123,7 @@ class Osc(FetchMethod): f.write("apisrv = %s\n" % ud.host) f.write("scheme = http\n") f.write("su-wrapper = su -c\n") - f.write("build-root = %s\n" % data.expand('${WORKDIR}', d)) + f.write("build-root = %s\n" % d.getVar('WORKDIR', True)) f.write("urllist = %s\n" % d.getVar("OSCURLLIST", True)) f.write("extra-pkgs = gzip\n") f.write("\n") |