Add support to show curl/wget output from fwupdmgr/fwupdtool

This commit is contained in:
Mario Limonciello 2021-12-14 12:19:09 -06:00 committed by Mario Limonciello
parent 90baeaabbc
commit 7188e5b335
2 changed files with 9 additions and 1 deletions

View File

@ -15,6 +15,7 @@ with a non-standard filesystem layout.
* `FWUPD_SUPPORTED` overrides the `-Dsupported_build` meson option at runtime
* `FWUPD_VERBOSE` is set when running `--verbose`
* `FWUPD_XMLB_VERBOSE` can be set to show Xmlb silo regeneration
* `FWUPD_DOWNLOAD_VERBOSE` can be used to show wget or curl output
* standard glibc variables like `LANG` are also honored for CLI tools that are translated
* libcurl respects the session proxy, e.g. `http_proxy`, `all_proxy`, `sftp_proxy` and `no_proxy`

View File

@ -1034,6 +1034,13 @@ fu_util_install_task_sort_cb(gconstpointer a, gconstpointer b)
return fu_install_task_compare(task1, task2);
}
static void
fu_util_stdout_cb(const gchar *line, gpointer user_data)
{
if (g_getenv("FWUPD_DOWNLOAD_VERBOSE") != NULL)
g_debug("'%s'", line);
}
static gboolean
fu_util_download_out_of_process(const gchar *uri, const gchar *fn, GError **error)
{
@ -1048,7 +1055,7 @@ fu_util_download_out_of_process(const gchar *uri, const gchar *fn, GError **erro
g_debug("%s", error_local->message);
continue;
}
return fu_common_spawn_sync(argv[i], NULL, NULL, 0, NULL, error);
return fu_common_spawn_sync(argv[i], fu_util_stdout_cb, NULL, 0, NULL, error);
}
g_set_error_literal(error,
FWUPD_ERROR,