summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/fetch2/wget.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index ffae5405b0..8bc9e93ca0 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -438,9 +438,19 @@ class Wget(FetchMethod):
438 for line in soup.find_all('a', href=True): 438 for line in soup.find_all('a', href=True):
439 s = dirver_regex.search(line['href'].strip("/")) 439 s = dirver_regex.search(line['href'].strip("/"))
440 if s: 440 if s:
441 version_dir_new = ['', s.group('ver'), ''] 441 sver = s.group('ver')
442
443 # When prefix is part of the version directory it need to
444 # ensure that only version directory is used so remove previous
445 # directories if exists.
446 #
447 # Example: pfx = '/dir1/dir2/v' and version = '2.5' the expected
448 # result is v2.5.
449 spfx = s.group('pfx').split('/')[-1]
450
451 version_dir_new = ['', sver, '']
442 if self._vercmp(version_dir, version_dir_new) <= 0: 452 if self._vercmp(version_dir, version_dir_new) <= 0:
443 dirver_new = s.group('pfx') + s.group('ver') 453 dirver_new = spfx + sver
444 path = ud.path.replace(dirver, dirver_new, True) \ 454 path = ud.path.replace(dirver, dirver_new, True) \
445 .split(package)[0] 455 .split(package)[0]
446 uri = bb.fetch.encodeurl([ud.type, ud.host, path, 456 uri = bb.fetch.encodeurl([ud.type, ud.host, path,