[pacman-dev] [PATCH] makepkg: assign fragment for bzr revision

Allan McRae allan at archlinux.org
Tue May 14 21:16:19 EDT 2013


On 15/05/13 05:33, Dave Reisner wrote:
> Fixes FS#35281
> 
> Signed-off-by: Dave Reisner <dreisner at archlinux.org>
> ---
>  scripts/makepkg.sh.in | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index b85b87e..88f3e2a 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -452,7 +452,8 @@ download_bzr() {
>  	local displaylocation="$url"
>  	local revision=('-r-1')
>  
> -	if [[ -n $fragment ]]; then
> +	if [[ $netfile = *\#* ]]; then
> +		local fragment=${netfile#*#}
>  		case ${fragment%%=*} in
>  			revision)
>  				revision=("-r${fragment##*=}")
> 

Nack.

fragment should not be needed in any way during download_bzr.  That
section that checks for the valid fragment should be moved to
extract_bzr, just like it is in every other VCS.

Allan



More information about the pacman-dev mailing list