summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-07 17:49:56 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-07 17:49:56 +0000
commitd8e1f1457c6394d486d31a156b9ee53a2c5e1728 (patch)
tree979fc8fbca1ba1052a267d8feb677366bc6865a6
parent78da84a49be602588b5ecb0d92d99a27f14af8fb (diff)
downloaddrakx-d8e1f1457c6394d486d31a156b9ee53a2c5e1728.tar
drakx-d8e1f1457c6394d486d31a156b9ee53a2c5e1728.tar.gz
drakx-d8e1f1457c6394d486d31a156b9ee53a2c5e1728.tar.bz2
drakx-d8e1f1457c6394d486d31a156b9ee53a2c5e1728.tar.xz
drakx-d8e1f1457c6394d486d31a156b9ee53a2c5e1728.zip
(ftp_prepare) retry with FTP instead of HTTP when there's no proxy and
user didn't provided the architecture in the URL (small issue introduced in commit r2774 on 2012-01-23, was: "(ftp_prepare) try arched directory for FTP installs too...")
-rw-r--r--mdk-stage1/NEWS2
-rw-r--r--mdk-stage1/network.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index 6f7a51b39..f49a64263 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,5 +1,7 @@
- fix URL passed to stage2 when user didn't provide the arch in the
install path (mga#6823)
+- retry with FTP instead of HTTP when there's no proxy and user didn't
+ provided the architecture in the URL
1.71
- silent hid_generic loading
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index 55249fa34..9030fbbde 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -1077,7 +1077,10 @@ enum return_type ftp_prepare(void)
log_message("%s failed.", location_full);
char *with_arch = asprintf_("%s%s/%s/%s", answers[1][0] == '/' ? "" : "/", answers[1], ARCH, COMPRESSED_FILE_REL("/"));
log_message("trying %s...", with_arch);
- fd = http_download_file(answers[0], with_arch, &size, use_http_proxy ? "http" : NULL, http_proxy_host, http_proxy_port);
+ if (use_http_proxy)
+ fd = http_download_file(answers[0], with_arch, &size, use_http_proxy ? "http" : NULL, http_proxy_host, http_proxy_port);
+ else
+ fd = ftp_start_download(ftp_serv_response, with_arch, &size);
if (0 < fd) {
strcpy(location_full, with_arch);
need_arch = 1;