[pacman-dev] [PATCH] makepkg: do not update pkgver when building source package

[Allan McRae]

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 <allan at archlinux.org>
---
 scripts/makepkg.sh.in |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 97acfb4..c97eff2 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1098,14 +1098,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
-- 
1.6.2.4