From 622a42163f4bb4903e51dc6e419b32f959356686 Mon Sep 17 00:00:00 2001 From: Vicente Bergas Date: Thu, 12 Jun 2014 20:19:21 +0100 Subject: [PATCH] patch for FS#39718 Signed-off-by: Vicente Bergas --- scripts/makepkg.sh.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 96e5349..9b7b2fc 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -513,10 +513,12 @@ extract_bzr() { fi local dir=$(get_filepath "$netfile") - [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" + [[ -z "$dir" ]] && dir="$SRCDEST/$repo" + local rel_dir=$(dirname "$repo") + repo=$(basename "$repo") msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "bzr" - pushd "$srcdir" &>/dev/null + pushd "$srcdir/$rel_dir" &>/dev/null rm -rf "${dir##*/}" if ! { bzr checkout "$dir" "${revision[@]}" --lightweight && -- 2.0.0