[pacman-dev] [PATCH] Fix FS#33318 - Make makepkg check for $pkgdir and $srcdir before manpage compression.

[Andrew Gregory]

On Sat, 26 Jan 2013 16:17:13 -0500
Richard Pougnet <richard at pougnet.ca> wrote:

> Call check_package() before calling tidy_package to check for
> references to $srcdir and $pkgdir before manpages are compressed.
> This allows any references inserted into manpages during the build to
> be retained. ---
>  scripts/makepkg.sh.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index dcd920d..e28b7fd 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -2790,9 +2790,9 @@ if (( INFAKEROOT )); then
>  		else
>  			run_package
>  		fi
> -		tidy_install
>  		create_package
>  		create_debug_package
> +		tidy_install
>  		pkgdir="${pkgdir%/*}"
>  	else
>  		run_split_packaging
> @@ -2930,9 +2930,9 @@ else
>  					warning "$(gettext
> "Repackaging without the use of a %s function is deprecated.")"
> "package()" plain "$(gettext "File permissions may not be
> preserved.")" fi
> -			tidy_install
>  			create_package
>  			create_debug_package
> +			tidy_install
>  			pkgdir="${pkgdir%/*}"
>  		else
>  			run_split_packaging

It's a little too late to tidy anything after the package has been
created.  The easiest way to fix the problem is probably to move
check_package's functionality into tidy_install as described by Allan
here:
https://mailman.archlinux.org/pipermail/pacman-dev/2013-January/016311.html