mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: fetch2: Ensure GCP fetcher checks if file exists before download.

Browse Source 
The GCP fetcher was calling bb.fetch2.check_network_access with
"gsutil stat" as the command, but then never actually ran that
command to check if the file exists. In cases where the file did
not exist in a gs:// premirror, this would lead to an unhandled
exception from do_fetch when the GCP python API tried to perform
the download.

This change resolves that issue by adding a runfetchcmd to call
gsutil.

(Bitbake rev: 1ab1d36c0af6fc58a974106b61ff4d37da6cb229)

Signed-off-by: Charlie Johnston <charlie.johnston@loftorbital.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Charlie Johnston
2023-11-27 06:11:47 -07:00
committed by Richard Purdie
parent 64725a9c32
commit 1f8a639a67
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/fetch2/gcp.py
+5 -2
View File
@@ -47,6 +47,7 @@ class GCP(FetchMethod):
ud.basename = os.path.basename(ud.path) ud.basename = os.path.basename(ud.path)
ud.localfile = d.expand(urllib.parse.unquote(ud.basename)) ud.localfile = d.expand(urllib.parse.unquote(ud.basename))
ud.basecmd = "gsutil stat"
def get_gcp_client(self): def get_gcp_client(self):
from google.cloud import storage from google.cloud import storage
@@ -61,7 +62,8 @@ class GCP(FetchMethod):
if self.gcp_client is None: if self.gcp_client is None:
self.get_gcp_client() self.get_gcp_client()
bb.fetch2.check_network_access(d, "gsutil stat", ud.url) bb.fetch2.check_network_access(d, ud.basecmd, f"gs://{ud.host}{ud.path}")
runfetchcmd("%s %s" % (ud.basecmd, f"gs://{ud.host}{ud.path}"), d)
# Path sometimes has leading slash, so strip it # Path sometimes has leading slash, so strip it
path = ud.path.lstrip("/") path = ud.path.lstrip("/")
@@ -88,7 +90,8 @@ class GCP(FetchMethod):
if self.gcp_client is None: if self.gcp_client is None:
self.get_gcp_client() self.get_gcp_client()
bb.fetch2.check_network_access(d, "gsutil stat", ud.url) bb.fetch2.check_network_access(d, ud.basecmd, f"gs://{ud.host}{ud.path}")
runfetchcmd("%s %s" % (ud.basecmd, f"gs://{ud.host}{ud.path}"), d)
# Path sometimes has leading slash, so strip it # Path sometimes has leading slash, so strip it
path = ud.path.lstrip("/") path = ud.path.lstrip("/")