Skip to contentSkip to conversation

fetch/wget: in upstream version checks, match versioned directories exactly

PATCH New Alexander Kanavin 1 participant 1 message Apr 22

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fetch/wget: in upstream version checks, match versioned directories exactly

From: Alexander Kanavin <[email protected]>

This change is in code that iterates over a html page, picking out links to versioned subdirectories to check further for new versions.

Without the ^ and $ guards, there would be sub-string matches. This results in querying the server multiple times for the same directory (for example,
perl check where the page contains multiple references to 5.0/something-unrelated) or querying the server for directory that doesn't exist (nasm check, where existence of 3.02rcX directories would result in querying the server for non-existing 3.02).

I have confirmed that the overall oe-core version check returns same results as before, with less network churn and nasm version check working properly again.

---
 lib/bb/fetch2/wget.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/bb/fetch2/wget.py +1 -1
index ca4959ab5..6ac4306c0 100644
@@ -539,7 +539,7 @@ class Wget(FetchMethod):
         version_dir = ['', '', '']
         version = ['', '', '']
 
-        dirver_regex = re.compile(r"(?P<pfx>\D*)(?P<ver>(\d+[\.\-_])*(\d+))")
+        dirver_regex = re.compile(r"^(?P<pfx>\D*)(?P<ver>(\d+[\.\-_])*(\d+))$")
         s = dirver_regex.search(dirver)
         if s:
             version_dir[1] = s.group('ver')
Signature · 1 line
2.47.3