diff options
| author | Yu Ke <ke.yu@intel.com> | 2011-01-18 23:17:50 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-25 12:25:47 +0000 |
| commit | e2ac26e7b1a1d058915d489cf3e0985484e1f69e (patch) | |
| tree | b31a3e9a4206790ddd0c8c8402e7759e4f16127a | |
| parent | e05918937c515dff845fcb4c9e94f8ecbea8c957 (diff) | |
| download | poky-e2ac26e7b1a1d058915d489cf3e0985484e1f69e.tar.gz | |
base/sstate.bbclass: Rename fetcher "go" method to "download" when using fetch v2
Signed-off-by: Yu Ke <ke.yu@intel.com>
| -rw-r--r-- | meta/classes/base.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/sstate.bbclass | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index ec55d4aa72..42291557b0 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
| @@ -135,7 +135,10 @@ python base_do_fetch() { | |||
| 135 | raise bb.build.FuncFailed("Malformed URL: %s" % value) | 135 | raise bb.build.FuncFailed("Malformed URL: %s" % value) |
| 136 | 136 | ||
| 137 | try: | 137 | try: |
| 138 | bb.fetch.go(localdata) | 138 | if bb.fetch.__version__ == "1": |
| 139 | bb.fetch.go(localdata) | ||
| 140 | else: | ||
| 141 | bb.fetch.download(localdata) | ||
| 139 | except bb.fetch.MissingParameterError: | 142 | except bb.fetch.MissingParameterError: |
| 140 | (type, value, traceback) = sys.exc_info() | 143 | (type, value, traceback) = sys.exc_info() |
| 141 | raise bb.build.FuncFailed("Missing parameters: %s" % value) | 144 | raise bb.build.FuncFailed("Missing parameters: %s" % value) |
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 807e8e39aa..dbe0e46b54 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
| @@ -344,7 +344,10 @@ def pstaging_fetch(sstatepkg, d): | |||
| 344 | # we will build the package | 344 | # we will build the package |
| 345 | try: | 345 | try: |
| 346 | bb.fetch.init([srcuri], localdata) | 346 | bb.fetch.init([srcuri], localdata) |
| 347 | bb.fetch.go(localdata, [srcuri]) | 347 | if bb.fetch.__version__ == "1": |
| 348 | bb.fetch.go(localdata, [srcuri]) | ||
| 349 | else: | ||
| 350 | bb.fetch.download(localdata, [srcuri]) | ||
| 348 | # Need to optimise this, if using file:// urls, the fetcher just changes the local path | 351 | # Need to optimise this, if using file:// urls, the fetcher just changes the local path |
| 349 | # For now work around by symlinking | 352 | # For now work around by symlinking |
| 350 | localpath = bb.data.expand(bb.fetch.localpath(srcuri, localdata), localdata) | 353 | localpath = bb.data.expand(bb.fetch.localpath(srcuri, localdata), localdata) |
