[pacman-dev] [PATCH] Skip devel_check() when repackaging

Allan McRae allan at archlinux.org
Sat Dec 12 08:09:07 EST 2009


Nezmer wrote:
> Currently, "makepkg -R" creates a package with a wrong updated $pkgver.
> 
> Signed-off-by: Nezmer <Nezmer at allurelinux.org>
> ---
>  scripts/makepkg.sh.in |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index ceaa8a6..0e18e3f 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -1265,7 +1265,7 @@ devel_check() {
>  
>  	# Do not update pkgver if --holdver is set, when building a source package,
>  	# when reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w)
> -	if (( HOLDVER || SOURCEONLY )) \
> +	if (( HOLDVER || SOURCEONLY || REPKG )) \
>  		            || [[ ! -f $BUILDFILE || ! -w $BUILDFILE ]]; then
>  		return
>  	fi

Pulled to my working branch with an update to the comment above the change.

Allan



More information about the pacman-dev mailing list