From 170dd77e4af60a4df8ffbf88882b4b158954a754 Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Fri, 7 Feb 2025 13:46:56 +0100 Subject: [PATCH] bitbake: fetch2: remove unnecessary unquote The URI path is already unquoted. Remove the unnecessary unquote function calls for URI path values. (Bitbake rev: 3de12bbc28b5a4189b849720735cf3e268d3941d) Signed-off-by: Stefan Herbrechtsmeier Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/gcp.py | 2 +- bitbake/lib/bb/fetch2/s3.py | 2 +- bitbake/lib/bb/fetch2/sftp.py | 2 +- bitbake/lib/bb/fetch2/wget.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bitbake/lib/bb/fetch2/gcp.py b/bitbake/lib/bb/fetch2/gcp.py index 268267b7ac..86546d40bf 100644 --- a/bitbake/lib/bb/fetch2/gcp.py +++ b/bitbake/lib/bb/fetch2/gcp.py @@ -46,7 +46,7 @@ class GCP(FetchMethod): else: ud.basename = os.path.basename(ud.path) - ud.localfile = urllib.parse.unquote(ud.basename) + ud.localfile = ud.basename def get_gcp_client(self): from google.cloud import storage diff --git a/bitbake/lib/bb/fetch2/s3.py b/bitbake/lib/bb/fetch2/s3.py index fa5292dfd7..22c0538139 100644 --- a/bitbake/lib/bb/fetch2/s3.py +++ b/bitbake/lib/bb/fetch2/s3.py @@ -77,7 +77,7 @@ class S3(FetchMethod): else: ud.basename = os.path.basename(ud.path) - ud.localfile = urllib.parse.unquote(ud.basename) + ud.localfile = ud.basename ud.basecmd = d.getVar("FETCHCMD_s3") or "/usr/bin/env aws s3" diff --git a/bitbake/lib/bb/fetch2/sftp.py b/bitbake/lib/bb/fetch2/sftp.py index 45b6afb4ad..bee71a0d0d 100644 --- a/bitbake/lib/bb/fetch2/sftp.py +++ b/bitbake/lib/bb/fetch2/sftp.py @@ -77,7 +77,7 @@ class SFTP(FetchMethod): else: ud.basename = os.path.basename(ud.path) - ud.localfile = urllib.parse.unquote(ud.basename) + ud.localfile = ud.basename def download(self, ud, d): """Fetch urls""" diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index 7066d5e2ca..6cb728ab43 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py @@ -78,9 +78,9 @@ class Wget(FetchMethod): else: ud.basename = os.path.basename(ud.path) - ud.localfile = urllib.parse.unquote(ud.basename) + ud.localfile = ud.basename if not ud.localfile: - ud.localfile = urllib.parse.unquote(ud.host + ud.path).replace("/", ".") + ud.localfile = ud.host + ud.path.replace("/", ".") self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 100"