proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-07-25 23:30:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Fix ctrl+c when downloading with IPFS

Browse Source
This commit is contained in:
Richard Hughes 2021-11-08 20:53:02 +00:00
parent eb508129a8
commit 09b946cb40
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libfwupd/fwupd-client.c
View File

@ -4531,7 +4531,10 @@ fwupd_client_stream_read_bytes(GInputStream *stream, GError **error)
} }
static GBytes * static GBytes *
fwupd_client_download_ipfs(FwupdClient *self, const gchar *url, GError **error) fwupd_client_download_ipfs(FwupdClient *self,
const gchar *url,
GCancellable *cancellable,
GError **error)
{ {
GInputStream *stream = NULL; GInputStream *stream = NULL;
g_autofree gchar *path = NULL; g_autofree gchar *path = NULL;
@ -4555,7 +4558,7 @@ fwupd_client_download_ipfs(FwupdClient *self, const gchar *url, GError **error)
g_subprocess_new(G_SUBPROCESS_FLAGS_STDOUT_PIPE, error, "ipfs", "cat", path, NULL); g_subprocess_new(G_SUBPROCESS_FLAGS_STDOUT_PIPE, error, "ipfs", "cat", path, NULL);
if (subprocess == NULL) if (subprocess == NULL)
return NULL; return NULL;
if (!g_subprocess_wait_check(subprocess, NULL, error)) if (!g_subprocess_wait_check(subprocess, cancellable, error))
return NULL; return NULL;
/* get raw stdout */ /* get raw stdout */
@ -4637,7 +4640,7 @@ fwupd_client_download_bytes_thread_cb(GTask *task,
if (blob != NULL) if (blob != NULL)
break; break;
} else if (fwupd_client_is_url_ipfs(url)) { } else if (fwupd_client_is_url_ipfs(url)) {
blob = fwupd_client_download_ipfs(self, url, &error); blob = fwupd_client_download_ipfs(self, url, cancellable, &error);
if (blob != NULL) if (blob != NULL)
break; break;
} else { } else {