summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass5
-rw-r--r--meta/classes/sstate.bbclass5
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)