opkg: improve download error reporting

[oweals/opkg-lede.git] / opkg_download.c

diff --git a/opkg_download.c b/opkg_download.c
index 63702508fd99413397a34070a1c63105f83a1822..161a5100363e917f8c92e3b0ec168ec29b106096 100644 (file)
--- a/opkg_download.c
+++ b/opkg_download.c
@@ -60,6 +60,12 @@ curl_progress_func (char* url,
     }
 #endif
 
     }
 #endif
 

+    /* skip progress bar if we haven't done started yet
+     * this prevents drawing the progress bar if we receive an error such as
+     * file not found */
+    if (t == 0)
+       return 0;
+

     printf ("\r%3d%% |", p);
     for (i = 1; i < 73; i++)
     {
     printf ("\r%3d%% |", p);
     for (i = 1; i < 73; i++)
     {


@@ -166,7 +172,12 @@ int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name
        curl_easy_cleanup (curl);
        fclose (file);
        if (res)
        curl_easy_cleanup (curl);
        fclose (file);
        if (res)

+       {
+           long error_code;
+           curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &error_code);
+           opkg_message(conf, OPKG_ERROR, "Failed to download %s, error %d\n", src, error_code);

            return res;
            return res;

+       }

 
     }
     else
 
     }
     else