From e2ac26e7b1a1d058915d489cf3e0985484e1f69e Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Tue, 18 Jan 2011 23:17:50 +0800 Subject: base/sstate.bbclass: Rename fetcher "go" method to "download" when using fetch v2 Signed-off-by: Yu Ke --- meta/classes/base.bbclass | 5 ++++- meta/classes/sstate.bbclass | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'meta/classes') 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() { raise bb.build.FuncFailed("Malformed URL: %s" % value) try: - bb.fetch.go(localdata) + if bb.fetch.__version__ == "1": + bb.fetch.go(localdata) + else: + bb.fetch.download(localdata) except bb.fetch.MissingParameterError: (type, value, traceback) = sys.exc_info() 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): # we will build the package try: bb.fetch.init([srcuri], localdata) - bb.fetch.go(localdata, [srcuri]) + if bb.fetch.__version__ == "1": + bb.fetch.go(localdata, [srcuri]) + else: + bb.fetch.download(localdata, [srcuri]) # Need to optimise this, if using file:// urls, the fetcher just changes the local path # For now work around by symlinking localpath = bb.data.expand(bb.fetch.localpath(srcuri, localdata), localdata) -- cgit v1.2.3-54-g00ecf