From 4aadbe2159cd6096529d147dba8bd13470903039 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 21 Sep 2018 12:31:57 -0400 Subject: [PATCH] lib/fetcher-curl: Prefix fatal errors with full URL Just include the whole URL that failed if libcurl failed with something elementary like CURLE_COULDNT_CONNECT or CURLE_COULDNT_RESOLVE_HOST. Closes: #1731 Closes: #1732 Approved by: cgwalters --- src/libostree/ostree-fetcher-curl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libostree/ostree-fetcher-curl.c b/src/libostree/ostree-fetcher-curl.c index 2583143e..9738f980 100644 --- a/src/libostree/ostree-fetcher-curl.c +++ b/src/libostree/ostree-fetcher-curl.c @@ -322,13 +322,12 @@ check_multi_info (OstreeFetcher *fetcher) { /* Handle file not found */ g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, - "%s", - curl_easy_strerror (curlres)); + "%s", curl_easy_strerror (curlres)); } else { - g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "[%u] %s", - curlres, + g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, + "While fetching %s: [%u] %s", eff_url, curlres, curl_easy_strerror (curlres)); _ostree_fetcher_journal_failure (req->fetcher->remote_name, eff_url, curl_easy_strerror (curlres));