diff options
| author | Allan McRae <allan@archlinux.org> | 2015-02-20 01:36:18 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-02-20 01:36:18 +0100 |
| commit | 7879a5b3e5c66d31b9375242f026a40464a6b34f (patch) | |
| tree | a4623b9213a02d88e8142c16829cec4251df6b38 /scripts/makepkg.sh.in | |
| parent | adc6ca1f2c08bb01a29f5247bfa5ee3bd30ee727 (diff) | |
| parent | 068f8cec42057751f528b19cece37db13ae92541 (diff) | |
| download | pacman-7879a5b3e5c66d31b9375242f026a40464a6b34f.tar.gz pacman-7879a5b3e5c66d31b9375242f026a40464a6b34f.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'scripts/makepkg.sh.in')
| -rw-r--r-- | scripts/makepkg.sh.in | 17 |
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 |