diff options
| author | Allan McRae <allan@archlinux.org> | 2009-04-26 11:52:29 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2009-05-14 08:30:01 +0200 |
| commit | de44a0f474f4e78359b890644645bd7e153983d2 (patch) | |
| tree | 534bd63e849948252ddc6cf01cfc0d73bb55441f | |
| parent | 20017354f7ccb58bf4f78691985a5d237f4dbc90 (diff) | |
| download | pacman-de44a0f474f4e78359b890644645bd7e153983d2.tar.gz pacman-de44a0f474f4e78359b890644645bd7e153983d2.tar.xz | |
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 <allan@archlinux.org>
| -rw-r--r-- | 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 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 |