summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2014-09-23 14:04:47 -0400
committerAllan McRae <allan@archlinux.org>2014-11-17 13:01:43 +1000
commit694901259031c19178cbfaa7087a2950d2dde477 (patch)
tree467e664df40cd0f6a1a7468c9ad67ee4c8094746 /scripts
parentdb2562113ba014442568f9ba76a0c6a01674fcd4 (diff)
downloadpacman-694901259031c19178cbfaa7087a2950d2dde477.tar.xz
makepkg: do not strip bzr+ from bzr+ssh urls
bzr does not recognize bare ssh:// urls. Fixes FS#41811 Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 4f35f2d3..3b9702e3 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -446,7 +446,9 @@ download_bzr() {
local netfile=$1
local url=$(get_url "$netfile")
- url=${url##*bzr+}
+ if [[ $url != bzr+ssh* ]]; then
+ url=${url##*bzr+}
+ fi
url=${url%%#*}
local repo=$(get_filename "$netfile")