[pacman-dev] [PATCH 1/2] 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> --- 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
Referenced by FS#41811 Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> --- scripts/makepkg.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f58afda..894d9e5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -447,7 +447,7 @@ download_bzr() { local url=$(get_url "$netfile") if [[ $url != bzr+ssh* ]]; then - url=${url##*bzr+} + url=${url#bzr+} fi url=${url%%#*} @@ -539,7 +539,7 @@ download_git() { local repo=$(get_filename "$netfile") local url=$(get_url "$netfile") - url=${url##*git+} + url=${url#git+} url=${url%%#*} if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then @@ -628,7 +628,7 @@ download_hg() { local repo=$(get_filename "$netfile") local url=$(get_url "$netfile") - url=${url##*hg+} + url=${url#hg+} url=${url%%#*} if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then @@ -703,7 +703,7 @@ download_svn() { local url=$(get_url "$netfile") if [[ $url != svn+ssh* ]]; then - url=${url##*svn+} + url=${url#svn+} fi url=${url%%#*} -- 2.1.0
participants (1)
-
Andrew Gregory