[pacman-dev] [PATCH 2/4] makepkg: svn: update existing sources in srcdir without removing them first.

Allan McRae allan at archlinux.org
Sun Nov 9 07:34:01 UTC 2014


On 10/12/13 06:31, Lukáš Jirkovský wrote:
> This matches the behaviour with non-VCS sources. It also allows incremental
> builds when subversion is used to obtain sources.
> 
> Signed-off-by: Lukáš Jirkovský <l.jirkovsky at gmail.com>
> ---

OK.  There is not much we can do about files potentially not being
removed if we jump between revisions here.  We need a note added to the
VCS section of the PKGBUILD man page that we try to do an incremental
build and to use -C for non-distributed VCS (only SVN) if the file
layout of the repo has changed.

>  scripts/makepkg.sh.in | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index aeb231a..84183b0 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -747,12 +747,8 @@ extract_svn() {
>  	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
> +	cp -au "$dir" "$srcdir"
>  }
>  
>  download_sources() {
> 


More information about the pacman-dev mailing list