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/svn.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/svn.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/svn.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py index 3271be326c..3f172eec9b 100644 --- a/bitbake/lib/bb/fetch2/svn.py +++ b/bitbake/lib/bb/fetch2/svn.py | |||
@@ -28,7 +28,6 @@ import sys | |||
28 | import logging | 28 | import logging |
29 | import bb | 29 | import bb |
30 | import re | 30 | import re |
31 | from bb import data | ||
32 | from bb.fetch2 import FetchMethod | 31 | from bb.fetch2 import FetchMethod |
33 | from bb.fetch2 import FetchError | 32 | from bb.fetch2 import FetchError |
34 | from bb.fetch2 import MissingParameterError | 33 | from bb.fetch2 import MissingParameterError |
@@ -61,7 +60,7 @@ class Svn(FetchMethod): | |||
61 | 60 | ||
62 | # Create paths to svn checkouts | 61 | # Create paths to svn checkouts |
63 | relpath = self._strip_leading_slashes(ud.path) | 62 | relpath = self._strip_leading_slashes(ud.path) |
64 | ud.pkgdir = os.path.join(data.expand('${SVNDIR}', d), ud.host, relpath) | 63 | ud.pkgdir = os.path.join(d.expand('${SVNDIR}'), ud.host, relpath) |
65 | ud.moddir = os.path.join(ud.pkgdir, ud.module) | 64 | ud.moddir = os.path.join(ud.pkgdir, ud.module) |
66 | 65 | ||
67 | ud.setup_revisions(d) | 66 | ud.setup_revisions(d) |
@@ -69,7 +68,7 @@ class Svn(FetchMethod): | |||
69 | if 'rev' in ud.parm: | 68 | if 'rev' in ud.parm: |
70 | ud.revision = ud.parm['rev'] | 69 | ud.revision = ud.parm['rev'] |
71 | 70 | ||
72 | ud.localfile = data.expand('%s_%s_%s_%s_.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision), d) | 71 | ud.localfile = d.expand('%s_%s_%s_%s_.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision)) |
73 | 72 | ||
74 | def _buildsvncommand(self, ud, d, command): | 73 | def _buildsvncommand(self, ud, d, command): |
75 | """ | 74 | """ |