diff options
| author | Allan McRae <allan@archlinux.org> | 2012-01-08 14:57:48 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-01-08 19:13:32 +0100 |
| commit | 73d0d743bda5367fcab2453bbe21c15e481150c2 (patch) | |
| tree | 71bcad7c7c455793dc505cb011e4b713b429a774 | |
| parent | 2b38f4eab7684e0f1e78b0b10953bf28915e963a (diff) | |
| download | pacman-73d0d743bda5367fcab2453bbe21c15e481150c2.tar.gz pacman-73d0d743bda5367fcab2453bbe21c15e481150c2.tar.xz | |
makepkg: abort on missing download agent
makepkg would not abort on a missing download agent due to the
output variable being declared local on the same line as the
function call in the assignment. That would result in strange output
such as:
==> Retrieving Sources...
==> ERROR: There is no agent set up to handle foo URLs. Check /etc/makepkg.conf.
Aborting...
-> Downloading foobaz...
/home/arch/code/pacman/scripts/makepkg: line 401: foo://foobaz: No such file or directory
==> ERROR: Failure while downloading foobaz
Aborting...
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a700d9d0..797b8d78 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -551,7 +551,8 @@ download_sources() { fi # find the client we should use for this URL - local dlclient=$(get_downloadclient "$url") || exit $? + local dlclient + dlclient=$(get_downloadclient "$url") || exit $? msg2 "$(gettext "Downloading %s...")" "$file" # fix flyspray bug #3289 |