github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-02-06 09:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change mfile->name to filename in Metalink module's messages

Browse Source 
* src/metalink.c (retrieve_from_metalink): Change mfile->name to
  filename when referring to the downloaded file

The file name could have been changed by unique_create() (or by any
other mean) before downloading. Use the name of the downloaded file
(filename) when printing output which refer to it.
This commit is contained in:
Matthew White 2016-08-16 23:18:46 +02:00
parent f3f349a0cf
commit 666b7862bf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/metalink.c
View File

@ -325,7 +325,7 @@ retrieve_from_metalink (const metalink_t* metalink)
}
logprintf (LOG_VERBOSE, _("Computing checksum for %s\n"),
quote (mfile->name));
quote (filename));
DEBUGP (("Declared hash: %s\n", mchksum->hash));
@ -408,7 +408,7 @@ retrieve_from_metalink (const metalink_t* metalink)
{
logprintf (LOG_NOTQUIET,
_("Checksum mismatch for file %s.\n"),
quote (mfile->name));
quote (filename));
}
/* Stop as soon as we checked the supported checksum. */
@ -592,14 +592,14 @@ gpg_skip_verification:
if (retr_err != RETROK)
{
logprintf (LOG_VERBOSE, _("Failed to download %s. Skipping resource.\n"),
quote (mfile->name));
quote (filename ? filename : mfile->name));
}
else if (!hash_ok)
{
retr_err = METALINK_CHKSUM_ERROR;
logprintf (LOG_NOTQUIET,
_("File %s retrieved but checksum does not match. "
"\n"), quote (mfile->name));
"\n"), quote (filename));
}
#ifdef HAVE_GPGME
/* Signature will be only validated if hash check was successful. */
@ -608,7 +608,7 @@ gpg_skip_verification:
retr_err = METALINK_SIG_ERROR;
logprintf (LOG_NOTQUIET,
_("File %s retrieved but signature does not match. "
"\n"), quote (mfile->name));
"\n"), quote (filename));
}
#endif
last_retr_err = retr_err == RETROK ? last_retr_err : retr_err;