diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-08-27 14:04:33 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-09-01 11:14:23 +0100 |
commit | b54e95fd069217a192d9bb8a3c261e33600e2538 (patch) | |
tree | 7dade2dfbfeae068ebbfd1f092fcee1f2e844938 /bitbake | |
parent | 94f29466797b98404eaa77e420fe648b4832f8eb (diff) | |
download | openembedded-core-b54e95fd069217a192d9bb8a3c261e33600e2538.tar.gz openembedded-core-b54e95fd069217a192d9bb8a3c261e33600e2538.tar.bz2 openembedded-core-b54e95fd069217a192d9bb8a3c261e33600e2538.tar.xz openembedded-core-b54e95fd069217a192d9bb8a3c261e33600e2538.zip |
bitbake/fetch: Respect forcefetch even when pulling from a mirror
When pulling from a premirror we would prefer a local tarball even when the
caller had specified the forcefetch parameter.
Add an extra parameter 'force' to try_mirrors, defaulting to False. If set
the mirrors will be tested even if the file exists locally.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/fetch/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py index 47a44708b..ab097dda5 100644 --- a/bitbake/lib/bb/fetch/__init__.py +++ b/bitbake/lib/bb/fetch/__init__.py @@ -258,7 +258,7 @@ def go(d, urls = None): # First try fetching uri, u, from PREMIRRORS mirrors = [ i.split() for i in (bb.data.getVar('PREMIRRORS', d, 1) or "").split('\n') if i ] - localpath = try_mirrors(d, u, mirrors) + localpath = try_mirrors(d, u, mirrors, False, m.forcefetch(u, ud, d)) if not localpath: # Next try fetching from the original uri, u try: @@ -430,7 +430,7 @@ def runfetchcmd(cmd, d, quiet = False): return output -def try_mirrors(d, uri, mirrors, check = False): +def try_mirrors(d, uri, mirrors, check = False, force = False): """ Try to use a mirrored version of the sources. This method will be automatically called before the fetchers go. @@ -440,7 +440,7 @@ def try_mirrors(d, uri, mirrors, check = False): mirrors is the list of mirrors we're going to try """ fpath = os.path.join(data.getVar("DL_DIR", d, 1), os.path.basename(uri)) - if not check and os.access(fpath, os.R_OK): + if not check and os.access(fpath, os.R_OK) and not force: bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists, skipping checkout." % fpath) return fpath |