summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-20 12:47:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 13:10:33 +0100
commit3f441765a7f6c229c5f4cd4edc0d6d8a34da2d11 (patch)
treecf8f0d2da1ce15b04804df7c1202bf6164382c2c
parentf3fb4dc40f153cf4e80b4915e8d58e6fde74a29e (diff)
downloadpoky-3f441765a7f6c229c5f4cd4edc0d6d8a34da2d11.tar.gz
bitbake: fetch2: Explicitly check for mirror tarballs in mirror handling code
With support for things like git:// -> git:// urls, we need to be more explicity about the mirrortarball check since we need to fall through to the following code in other cases. (From Poky rev: 28e858cd6f7509468ef3e527a86820b9e06044db) (Bitbake rev: a2459f5ca2f517964287f9a7c666a6856434e631) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index e4af9519ba..737ae7ed8f 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -490,7 +490,8 @@ def try_mirror_url(newuri, origud, ud, ld, check = False):
490 # We may be obtaining a mirror tarball which needs further processing by the real fetcher 490 # We may be obtaining a mirror tarball which needs further processing by the real fetcher
491 # If that tarball is a local file:// we need to provide a symlink to it 491 # If that tarball is a local file:// we need to provide a symlink to it
492 dldir = ld.getVar("DL_DIR", True) 492 dldir = ld.getVar("DL_DIR", True)
493 if os.path.basename(ud.localpath) != os.path.basename(origud.localpath): 493 if origud.mirrortarball and os.path.basename(ud.localpath) == os.path.basename(origud.mirrortarball) \
494 and os.path.basename(ud.localpath) != os.path.basename(origud.localpath):
494 open(ud.donestamp, 'w').close() 495 open(ud.donestamp, 'w').close()
495 dest = os.path.join(dldir, os.path.basename(ud.localpath)) 496 dest = os.path.join(dldir, os.path.basename(ud.localpath))
496 if not os.path.exists(dest): 497 if not os.path.exists(dest):