diff options
| author | Chris Lumens <clumens@redhat.com> | 2008-03-14 14:48:29 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-03-14 14:48:29 -0400 |
| commit | 69f1f0b2b2fc0f80a4c177c1bdbef2138330db44 (patch) | |
| tree | ded72e898c59fa69afcc7114da3be83420da97f9 | |
| parent | 929932f8c4268e8505c3a23a9757d894ae14791c (diff) | |
| download | anaconda-69f1f0b2b2fc0f80a4c177c1bdbef2138330db44.tar.gz anaconda-69f1f0b2b2fc0f80a4c177c1bdbef2138330db44.tar.xz anaconda-69f1f0b2b2fc0f80a4c177c1bdbef2138330db44.zip | |
Fix some errors on reporting which files are being downloaded.
| -rw-r--r-- | loader2/urlinstall.c | 4 | ||||
| -rw-r--r-- | loader2/urls.c | 13 | ||||
| -rw-r--r-- | loader2/urls.h | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c index 1bb951c59..17c89d2f3 100644 --- a/loader2/urlinstall.c +++ b/loader2/urlinstall.c @@ -76,9 +76,9 @@ static int loadSingleUrlImage(struct iurlinfo * ui, char *path, else if (fd < 0) { if (!silentErrors) { newtWinMessage(_("Error"), _("OK"), - _("Unable to retrieve %s://%s."), + _("Unable to retrieve %s://%s/%s."), (ui->protocol == URL_METHOD_FTP ? "ftp" : "http"), - path); + ui->address, path); } if (ehdrs) free (ehdrs); diff --git a/loader2/urls.c b/loader2/urls.c index 19b834bbc..9f1e639eb 100644 --- a/loader2/urls.c +++ b/loader2/urls.c @@ -161,7 +161,7 @@ char *convertUIToURL(struct iurlinfo *ui) { /* extraHeaders only applicable for http and used for pulling ks from http */ /* see ftp.c:httpGetFileDesc() for details */ /* set to NULL if not needed */ -int urlinstStartTransfer(struct iurlinfo * ui, char *hostAndPath, +int urlinstStartTransfer(struct iurlinfo * ui, char *path, char *extraHeaders) { int fd, port; int family = -1; @@ -170,9 +170,9 @@ int urlinstStartTransfer(struct iurlinfo * ui, char *hostAndPath, char *hostname, *portstr, *filestr; struct hostent *host; - logMessage(INFO, "transferring %s://%s to a fd", + logMessage(INFO, "transferring %s://%s%s to a fd", ui->protocol == URL_METHOD_FTP ? "ftp" : "http", - hostAndPath); + ui->address, path); splitHostname(ui->address, &hostname, &portstr); if (portstr == NULL) @@ -194,11 +194,6 @@ int urlinstStartTransfer(struct iurlinfo * ui, char *hostAndPath, family = host->h_addrtype; } - if ((filestr = strchr(hostAndPath, '/')) == NULL) { - logMessage(ERROR, "Passed an invalid path: %s", hostAndPath); - return -1; - } - if (ui->protocol == URL_METHOD_FTP) { ui->ftpPort = ftpOpen(hostname, family, ui->login ? ui->login : "anonymous", @@ -224,7 +219,7 @@ int urlinstStartTransfer(struct iurlinfo * ui, char *hostAndPath, } if (!FL_CMDLINE(flags)) - winStatus(70, 3, _("Retrieving"), "%s %s...", _("Retrieving"), hostAndPath); + winStatus(70, 3, _("Retrieving"), "%s %s...", _("Retrieving"), path); if (hostname) free(hostname); return fd; diff --git a/loader2/urls.h b/loader2/urls.h index e1141e57e..046ee7220 100644 --- a/loader2/urls.h +++ b/loader2/urls.h @@ -40,7 +40,7 @@ char *convertUIToURL(struct iurlinfo *ui); int setupRemote(struct iurlinfo * ui); int urlMainSetupPanel(struct iurlinfo * ui, char * doSecondarySetup); int urlSecondarySetupPanel(struct iurlinfo * ui); -int urlinstStartTransfer(struct iurlinfo * ui, char *hostAndPath, char *extraHeaders); +int urlinstStartTransfer(struct iurlinfo * ui, char *path, char *extraHeaders); int urlinstFinishTransfer(struct iurlinfo * ui, int fd); #endif |