1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00

makepkg: check if $dir is a local clone of the right git repo

Before this patch, makepkg does not check if $dir is a local clone of
the right repo.

For example, git fetch would be run even if $dir is not a local
bare clone of a git repo in present in source(), but a subdir of
a checked-out one. That means makepkg can potentially fetch from
a completely unrelated remote and update completely unrelated
dirs/files.

This patch adds a check to make sure we are fetching from the right
remote.

Signed-off-by: Mohammad Alsaleh <msal@i2pmail.org>
This commit is contained in:
Mohammad Alsaleh 2012-08-12 00:24:57 +00:00 committed by Dan McGee
parent 34b52c9a60
commit c926c39b04

View File

@ -404,8 +404,14 @@ download_git() {
exit 1 exit 1
fi fi
elif (( ! HOLDVER )); then elif (( ! HOLDVER )); then
msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git"
cd_safe "$dir" cd_safe "$dir"
# Make sure we are fetching the right repo
if [[ "$url" != "$(git config --get remote.origin.url)" ]] ; then
error "$(gettext "%s is not a clone of %s")" "$dir" "$url"
plain "$(gettext "Aborting...")"
exit 1
fi
msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git"
if ! git fetch --all -p; then if ! git fetch --all -p; then
# only warn on failure to allow offline builds # only warn on failure to allow offline builds
warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git" warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git"