moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

makepkg: always check makepkg.conf for match to download protocol 

The list of which download protocol should look in makepkg.conf for the
download agent was hard coded into makepkg.  Instead, fallback to checking
the the download agents array for any non-local or (implemented) vcs
source.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2012-08-28 11:35:20 +10:00 committed by Dan McGee
parent 7a4f76c2af
commit 306c274239
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/makepkg.sh.in
View File

@ -284,7 +284,7 @@ get_downloadclient() {
# if we didn't find an agent, return an error
if [[ -z $agent ]]; then
error "$(gettext "There is no agent set up to handle %s URLs. Check %s.")" "$proto" "$MAKEPKG_CONF"
error "$(gettext "Unknown download protocol: %s")" "$proto"
plain "$(gettext "Aborting...")"
exit 1 # $E_CONFIG_ERROR
fi
@ -596,9 +596,6 @@ download_sources() {
local)
download_local "$netfile"
;;
ftp|http|https|rsync|scp)
download_file "$netfile"
;;
git*)
(( GET_VCS )) && download_git "$netfile"
;;
@ -609,9 +606,7 @@ download_sources() {
(( GET_VCS )) && download_svn "$netfile"
;;
*)
error "$(gettext "Unknown download protocol: %s")" "$proto"
plain "$(gettext "Aborting...")"
exit 1
download_file "$netfile"
;;
esac
done