From 9fe27b068ae40a407fd5dd12f974d84499d41ef0 Mon Sep 17 00:00:00 2001 From: Nezmer Date: Sat, 12 Dec 2009 01:25:32 +0200 Subject: makepkg: skip devel_check() when repackaging Currently, "makepkg -R" creates a package with a wrong updated $pkgver. Signed-off-by: Nezmer [Allan: adjusted comment] Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cbb1077f..40283fe2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1268,9 +1268,9 @@ check_sanity() { devel_check() { newpkgver="" - # 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 )) \ + # Do not update pkgver if --holdver is set, when building a source package, repackaging, + # reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w) + if (( HOLDVER || SOURCEONLY || REPKG )) \ || [[ ! -f $BUILDFILE || ! -w $BUILDFILE ]]; then return fi -- cgit v1.2.3-70-g09d2