summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-12-14 16:52:35 +0100
committerAllan McRae <allan@archlinux.org>2015-12-15 11:34:30 +0100
commita671fa497c7317e240e014e93bddfdbf1d270b2b (patch)
tree3d79b3fa2a45b1589d090ffa0a1ecd47bd2f4909
parenteadf38960776e36df75d6c3caf3a35b976acc56c (diff)
downloadpacman-a671fa497c7317e240e014e93bddfdbf1d270b2b.tar.gz
pacman-a671fa497c7317e240e014e93bddfdbf1d270b2b.tar.xz
makepkg: Output full URL in case of download failure
Most entries in $sources contain variables so finding out why a URL fails to download is hard because one has to manually replace the variables when looking at the PKGBUILD. Simply output the full URL here so that it can be easily seen what is wrong. Old: ==> ERROR: Failure while downloading example-1.2.4.tar.gz New: ==> ERROR: Failure while downloading http://example.org/releases/1.1/example-1.2.4.tar.gz With the new format it is much more obvious that the directory name is the culprint (1.1 vs 1.2) while the old one would not display that information. Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/libmakepkg/source/file.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in
index 03dabe63..53b983e3 100644
--- a/scripts/libmakepkg/source/file.sh.in
+++ b/scripts/libmakepkg/source/file.sh.in
@@ -71,7 +71,7 @@ download_file() {
if ! command -- "${cmdline[@]}" >&2; then
[[ ! -s $dlfile ]] && rm -f -- "$dlfile"
- error "$(gettext "Failure while downloading %s")" "$filename"
+ error "$(gettext "Failure while downloading %s")" "$url"
plain "$(gettext "Aborting...")"
exit 1
fi