diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2017-02-27 15:14:09 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 11:16:07 +0000 |
commit | b16192c93834d0a6530169557aa34122e1417bcf (patch) | |
tree | 194a2259542d50a1bafd8ea654a11ce0fd6d23d4 /bitbake/lib/bb/fetch2/bzr.py | |
parent | b1c48fb64619def3ee18286ccbb492e442e007dd (diff) | |
download | poky-b16192c93834d0a6530169557aa34122e1417bcf.tar.gz |
bitbake: fetch2: don't use deprecated bb.data APIs
Cleanup some more usage of bb.data APIs in the fetchers.
(Bitbake rev: 9752fd1c10b8fcc819822fa6eabc2c1050fcc03b)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/bzr.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/bzr.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py index 0f1c420ef7..16123f8af9 100644 --- a/bitbake/lib/bb/fetch2/bzr.py +++ b/bitbake/lib/bb/fetch2/bzr.py | |||
@@ -27,7 +27,6 @@ import os | |||
27 | import sys | 27 | import sys |
28 | import logging | 28 | import logging |
29 | import bb | 29 | import bb |
30 | from bb import data | ||
31 | from bb.fetch2 import FetchMethod | 30 | from bb.fetch2 import FetchMethod |
32 | from bb.fetch2 import FetchError | 31 | from bb.fetch2 import FetchError |
33 | from bb.fetch2 import runfetchcmd | 32 | from bb.fetch2 import runfetchcmd |
@@ -43,14 +42,14 @@ class Bzr(FetchMethod): | |||
43 | """ | 42 | """ |
44 | # Create paths to bzr checkouts | 43 | # Create paths to bzr checkouts |
45 | relpath = self._strip_leading_slashes(ud.path) | 44 | relpath = self._strip_leading_slashes(ud.path) |
46 | ud.pkgdir = os.path.join(data.expand('${BZRDIR}', d), ud.host, relpath) | 45 | ud.pkgdir = os.path.join(d.expand('${BZRDIR}'), ud.host, relpath) |
47 | 46 | ||
48 | ud.setup_revisions(d) | 47 | ud.setup_revisions(d) |
49 | 48 | ||
50 | if not ud.revision: | 49 | if not ud.revision: |
51 | ud.revision = self.latest_revision(ud, d) | 50 | ud.revision = self.latest_revision(ud, d) |
52 | 51 | ||
53 | ud.localfile = data.expand('bzr_%s_%s_%s.tar.gz' % (ud.host, ud.path.replace('/', '.'), ud.revision), d) | 52 | ud.localfile = d.expand('bzr_%s_%s_%s.tar.gz' % (ud.host, ud.path.replace('/', '.'), ud.revision)) |
54 | 53 | ||
55 | def _buildbzrcommand(self, ud, d, command): | 54 | def _buildbzrcommand(self, ud, d, command): |
56 | """ | 55 | """ |
@@ -58,7 +57,7 @@ class Bzr(FetchMethod): | |||
58 | command is "fetch", "update", "revno" | 57 | command is "fetch", "update", "revno" |
59 | """ | 58 | """ |
60 | 59 | ||
61 | basecmd = data.expand('${FETCHCMD_bzr}', d) | 60 | basecmd = d.expand('${FETCHCMD_bzr}') |
62 | 61 | ||
63 | proto = ud.parm.get('protocol', 'http') | 62 | proto = ud.parm.get('protocol', 'http') |
64 | 63 | ||