[pacman-dev] [PATCHv3] makepkg: Separate vcs download and extract

[Allan McRae]

On 09/03/13 07:34, William Giokas wrote:
> Previously makepkg would clone vcs sources in the download function,
> regardless of the noextract settings. Now the download_* functions only
> download or update the vcs sources, and the new extract_* functions just
> create working copies using the specified protocols. The extract_sources
> function will call the needed extract function for the protocol
> specified. The tarball extraction has also been moved into its own
> extract_file function to keep things consistent.
> 
> Signed-off-by: William Giokas <1007380 at gmail.com>
> ---
> 
> Oops. Forgot to delete that function. Thanks for the catch.
> 
>  scripts/makepkg.sh.in | 205 +++++++++++++++++++++++++++++++++-----------------
>  1 file changed, 137 insertions(+), 68 deletions(-)
> 

One more thing....


<snip>


> @@ -1224,6 +1314,12 @@ check_source_integrity() {
>  
>  extract_sources() {
>  	msg "$(gettext "Extracting sources...")"
> +
> +	local GET_VCS=1
> +	if [[ $1 == "fast" ]]; then
> +		GET_VCS=0
> +	fi
> +
>  	local netfile
>  	for netfile in "${source[@]}"; do
>  		local file=$(get_filename "$netfile")

<snip>

> +	if (( PKGVERFUNC && GET_VCS )); then
> +		update_pkgver
> +		check_pkgver || exit 1
> +		check_build_status
>  	fi

There is no "extract_sources fast" so this is wrong...  I'd guess where
it is now, the pkgver update should just be "if (( PKGVERFUNC ))".  The
first sections setting GET_VCS can be removed.

Allan