[pacman-dev] [PATCH 1/2] makepkg: do not strip bzr+ from bzr+ssh urls

Andrew Gregory andrew.gregory.8 at gmail.com
Tue Sep 23 14:04:47 EDT 2014


bzr does not recognize bare ssh:// urls.

Fixes FS#41811

Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
---
 scripts/makepkg.sh.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 913c901..f58afda 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")
-- 
2.1.0


More information about the pacman-dev mailing list