Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts/makepkg.sh.in
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2015-02-20 10:36:18 +1000
committerAllan McRae <allan@archlinux.org>2015-02-20 10:36:18 +1000
commit7879a5b3e5c66d31b9375242f026a40464a6b34f (patch)
treea4623b9213a02d88e8142c16829cec4251df6b38 /scripts/makepkg.sh.in
parentadc6ca1f2c08bb01a29f5247bfa5ee3bd30ee727 (diff)
parent068f8cec42057751f528b19cece37db13ae92541 (diff)
Merge branch 'maint'
Diffstat (limited to 'scripts/makepkg.sh.in')
-rw-r--r--scripts/makepkg.sh.in17
1 files changed, 0 insertions, 17 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index f47dc358..a9c2ebb8 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -448,23 +448,6 @@ download_bzr() {
exit 1
fi
elif (( ! HOLDVER )); then
- # Make sure we are fetching the right repo
- local distant_url="$(bzr info $url 2> /dev/null | sed -n '/branch root/{s/ branch root: //p;q;}')"
- local local_url="$(bzr config parent_location -d $dir)"
- if [[ -n $distant_url ]]; then
- if [[ $distant_url != "$local_url" ]]; then
- error "$(gettext "%s is not a branch of %s")" "$dir" "$url"
- plain "$(gettext "Aborting...")"
- exit 1
- fi
- else
- if [[ $url != "$local_url" ]] ; then
- error "$(gettext "%s is not a branch of %s")" "$dir" "$url"
- error "$(gettext "The local URL is %s")" "$local_url"
- plain "$(gettext "Aborting...")"
- exit 1
- fi
- fi
msg2 "$(gettext "Pulling %s ...")" "${displaylocation}"
cd_safe "$dir"
if ! bzr pull "$url"; then