summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2015-12-10 23:57:23 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-18 12:18:19 +0000
commit28ea1a1c957241ec59c88b27e18d95ac837cc180 (patch)
treee972b9d47a34d93b1ec82a0b000581296bd07d55 /bitbake/lib/bb/fetch2
parent5cb6d83f17b33f4c481e177e8fa3e7123e025d55 (diff)
downloadpoky-28ea1a1c957241ec59c88b27e18d95ac837cc180.tar.gz
bitbake: fetch: use orig localpath when calling orig method
When a mirror tarball is fetched, the original fetch method is called, which unpacks the mirror tarball. After the original method is called, it checks the localpath of the mirror tarball rather than the clone path, which isn't ideal, particularly if the mirror tarball was removed due to being out of date. We know the original fetch method will do what it needs to do to get its content in the form it needs from the mirror tarball, so we can use its localpath instead. (Bitbake rev: 1732ad65d6c7d67b7d07cb30c074f5016adadbea) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Awais Belal <awais_belal@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index d66a212cb3..68ebf8b8d2 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -955,7 +955,7 @@ def try_mirror_url(fetch, origud, ud, ld, check = False):
955 origud.method.download(origud, ld) 955 origud.method.download(origud, ld)
956 if hasattr(origud.method,"build_mirror_data"): 956 if hasattr(origud.method,"build_mirror_data"):
957 origud.method.build_mirror_data(origud, ld) 957 origud.method.build_mirror_data(origud, ld)
958 return ud.localpath 958 return origud.localpath
959 # Otherwise the result is a local file:// and we symlink to it 959 # Otherwise the result is a local file:// and we symlink to it
960 if not os.path.exists(origud.localpath): 960 if not os.path.exists(origud.localpath):
961 if os.path.islink(origud.localpath): 961 if os.path.islink(origud.localpath):