From ddc06f0a30eb4d512aa1c4b41e4a0dd8b9385d20 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sat, 29 Apr 2023 03:23:28 +0200 Subject: bitbake: fetch2/crate: Simplify extraction of crate names and versions from URIs (Bitbake rev: 4f2d8bcbaea33425f6de2c3c88a0beabec8a59f9) Signed-off-by: Peter Kjellerstedt Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/crate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/fetch2') diff --git a/bitbake/lib/bb/fetch2/crate.py b/bitbake/lib/bb/fetch2/crate.py index a7021e5b36..2b8b6bc7a1 100644 --- a/bitbake/lib/bb/fetch2/crate.py +++ b/bitbake/lib/bb/fetch2/crate.py @@ -59,11 +59,11 @@ class Crate(Wget): # version is expected to be the last token # but ignore possible url parameters which will be used # by the top fetcher class - version, _, _ = parts[len(parts) -1].partition(";") + version = parts[-1].split(";")[0] # second to last field is name - name = parts[len(parts) - 2] + name = parts[-2] # host (this is to allow custom crate registries to be specified - host = '/'.join(parts[2:len(parts) - 2]) + host = '/'.join(parts[2:-2]) # if using upstream just fix it up nicely if host == 'crates.io': -- cgit v1.2.3-54-g00ecf