From de44a0f474f4e78359b890644645bd7e153983d2 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sun, 26 Apr 2009 19:52:29 +1000 Subject: makepkg: do not update pkgver when building source package When making a source package for a SCM PKGBUILD, makepkg should not update the pkgver/pkgrel. Noted in FS#14456. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d978107f..ebc19bcb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1100,14 +1100,13 @@ install_package() { devel_check() { newpkgver="" - # Only update pkgver if --holdver is not set - if [ "$HOLDVER" -eq 1 ]; then - return - fi - # Cannot update pkgver/pkgrel if reading PKGBUILD from pipe - if [ ! -f "./$BUILDSCRIPT" ]; then + + # Do not update pkgver if --holdver is set, when building a source package, + # or when reading PKGBUILD from pipe + if [ "$HOLDVER" -eq 1 -o "$SOURCEONLY" -ne 0 -o ! -f "./$BUILDSCRIPT" ]; then return fi + if [ -z "$FORCE_VER" ]; then # Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so. # This will only be used on the first call to makepkg; subsequent -- cgit v1.2.3-24-g4f1b