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/osc.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/osc.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/osc.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py index 26f88e1f46..2b4f7d9c13 100644 --- a/bitbake/lib/bb/fetch2/osc.py +++ b/bitbake/lib/bb/fetch2/osc.py | |||
@@ -10,7 +10,6 @@ import os | |||
10 | import sys | 10 | import sys |
11 | import logging | 11 | import logging |
12 | import bb | 12 | import bb |
13 | from bb import data | ||
14 | from bb.fetch2 import FetchMethod | 13 | from bb.fetch2 import FetchMethod |
15 | from bb.fetch2 import FetchError | 14 | from bb.fetch2 import FetchError |
16 | from bb.fetch2 import MissingParameterError | 15 | from bb.fetch2 import MissingParameterError |
@@ -47,7 +46,7 @@ class Osc(FetchMethod): | |||
47 | else: | 46 | else: |
48 | ud.revision = "" | 47 | ud.revision = "" |
49 | 48 | ||
50 | ud.localfile = data.expand('%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.path.replace('/', '.'), ud.revision), d) | 49 | ud.localfile = d.expand('%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.path.replace('/', '.'), ud.revision)) |
51 | 50 | ||
52 | def _buildosccommand(self, ud, d, command): | 51 | def _buildosccommand(self, ud, d, command): |
53 | """ | 52 | """ |
@@ -55,7 +54,7 @@ class Osc(FetchMethod): | |||
55 | command is "fetch", "update", "info" | 54 | command is "fetch", "update", "info" |
56 | """ | 55 | """ |
57 | 56 | ||
58 | basecmd = data.expand('${FETCHCMD_osc}', d) | 57 | basecmd = d.expand('${FETCHCMD_osc}') |
59 | 58 | ||
60 | proto = ud.parm.get('protocol', 'ocs') | 59 | proto = ud.parm.get('protocol', 'ocs') |
61 | 60 | ||