mirror of
https://github.com/moparisthebest/pacman
synced 2025-01-09 04:57:59 -05:00
makepkg: checkout a revision specified in SVN fragment in download_svn.
Previously the sources were dowloaded in HEAD revision in the download_svn(). If a specific revision was requested in fragment, the code was updated to that revision in extract_svn(). However, because SVN is a centralized system, this means that the changed sources has to be downloaded again. By moving the fragment handling to download_svn(), we get the correct revision without having to download it later in extract_svn(). Signed-off-by: Lukáš Jirkovský <l.jirkovsky@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
f6b3c9d803
commit
f66ae5334e
@ -714,43 +714,7 @@ download_svn() {
|
|||||||
fi
|
fi
|
||||||
url=${url%%#*}
|
url=${url%%#*}
|
||||||
|
|
||||||
if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then
|
local ref=HEAD
|
||||||
msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "svn"
|
|
||||||
mkdir -p "$dir/.makepkg"
|
|
||||||
if ! svn checkout --config-dir "$dir/.makepkg" "$url" "$dir"; then
|
|
||||||
error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn"
|
|
||||||
plain "$(gettext "Aborting...")"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
elif (( ! HOLDVER )); then
|
|
||||||
msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "svn"
|
|
||||||
cd_safe "$dir"
|
|
||||||
if ! svn update; then
|
|
||||||
# only warn on failure to allow offline builds
|
|
||||||
warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "svn"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
extract_svn() {
|
|
||||||
local netfile=$1
|
|
||||||
|
|
||||||
local fragment=${netfile#*#}
|
|
||||||
if [[ $fragment = "$netfile" ]]; then
|
|
||||||
unset fragment
|
|
||||||
fi
|
|
||||||
|
|
||||||
local dir=$(get_filepath "$netfile")
|
|
||||||
[[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")"
|
|
||||||
|
|
||||||
local repo=${netfile##*/}
|
|
||||||
repo=${repo%%#*}
|
|
||||||
|
|
||||||
msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn"
|
|
||||||
pushd "$srcdir" &>/dev/null
|
|
||||||
rm -rf "${dir##*/}"
|
|
||||||
|
|
||||||
local ref
|
|
||||||
if [[ -n $fragment ]]; then
|
if [[ -n $fragment ]]; then
|
||||||
case ${fragment%%=*} in
|
case ${fragment%%=*} in
|
||||||
revision)
|
revision)
|
||||||
@ -763,15 +727,38 @@ extract_svn() {
|
|||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp -a "$dir" .
|
if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then
|
||||||
|
msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "svn"
|
||||||
if [[ -n ${ref} ]]; then
|
mkdir -p "$dir/.makepkg"
|
||||||
cd_safe "$(get_filename "$netfile")"
|
if ! svn checkout -r ${ref} --config-dir "$dir/.makepkg" "$url" "$dir"; then
|
||||||
if ! svn update -r ${ref}; then
|
error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn"
|
||||||
error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "svn"
|
|
||||||
plain "$(gettext "Aborting...")"
|
plain "$(gettext "Aborting...")"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
elif (( ! HOLDVER )); then
|
||||||
|
msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "svn"
|
||||||
|
cd_safe "$dir"
|
||||||
|
if ! svn update -r ${ref}; then
|
||||||
|
# only warn on failure to allow offline builds
|
||||||
|
warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "svn"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
extract_svn() {
|
||||||
|
local netfile=$1
|
||||||
|
|
||||||
|
local dir=$(get_filepath "$netfile")
|
||||||
|
[[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")"
|
||||||
|
|
||||||
|
local repo=${netfile##*/}
|
||||||
|
repo=${repo%%#*}
|
||||||
|
|
||||||
|
msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn"
|
||||||
|
pushd "$srcdir" &>/dev/null
|
||||||
|
rm -rf "${dir##*/}"
|
||||||
|
|
||||||
|
cp -a "$dir" .
|
||||||
|
|
||||||
popd &>/dev/null
|
popd &>/dev/null
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user