X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg_download.c;h=4dab8092f5001e5e94cc02e70edd235ec7849d7a;hp=4160b97ffeb34c95535110dd5776d91d6fc6b931;hb=10ead572b6cb9e92de05206867e0727220256b46;hpb=a18410f02b51d400450c30d0b769b2f1e3e6736a

diff --git a/libopkg/opkg_download.c b/libopkg/opkg_download.c
index 4160b97..4dab809 100644
--- a/libopkg/opkg_download.c
+++ b/libopkg/opkg_download.c
@@ -121,31 +121,6 @@ int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name
 	setenv("no_proxy", conf->no_proxy, 1);
     }
 
-    /* XXX: BUG rewrite to use execvp or else busybox's internal wget -Jamey 7/23/2002 */ 
-#if 0
-    sprintf_alloc(&cmd, "wget --passive-ftp %s %s%s %s%s %s -P %s %s",
-		  (conf->http_proxy || conf->ftp_proxy) ? "--proxy=on" : "",
-		  conf->proxy_user ? "--proxy-user=" : "",
-		  conf->proxy_user ? conf->proxy_user : "",
-		  conf->proxy_passwd ? "--proxy-passwd=" : "",
-		  conf->proxy_passwd ? conf->proxy_passwd : "",
-		  conf->verbose_wget ? "" : "-q",
-		  conf->tmp_dir,
-		  src);
-    err = xsystem(cmd);
-    if (err) {
-	if (err != -1) {
-	    opkg_message(conf,OPKG_ERROR, "%s: ERROR: Command failed with return value %d: `%s'\n",
-		    __FUNCTION__, err, cmd);
-	} 
-	unlink(tmp_file_location);
-	free(tmp_file_location);
-	free(src_basec);
-	free(cmd);
-	return EINVAL;
-    }
-    free(cmd);
-#endif
     CURL *curl;
     CURLcode res;
     FILE * file = fopen (tmp_file_location, "w");
@@ -182,7 +157,9 @@ int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name
     else
 	return -1;
 
-    printf ("\n");
+    /* if no custom progress handler was set, we need to clear the default progress bar */
+    if (!opkg_cb_download_progress)
+        printf ("\n");
 
     err = file_move(tmp_file_location, dest_file_name);