summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2015-12-14 23:53:53 +1000
committerAllan McRae <allan@archlinux.org>2015-12-15 20:28:48 +1000
commit8454daa7feef14b660561f2434448d0b4ac0576d (patch)
tree79a1aea0abf4510e8f9940cebeec7cc6c0b6df92 /scripts
parent686fae6d74c79310b5a8da04414a07ed9da299e1 (diff)
makepkg: run pkgver() and prepare() with --noextract
Modifications made to the source before running with --noextract may alter the version string returned by pkgver(). Always run this function if present and check build status before proceeding. Fixes FS#46800. Also run prepare() when --noextract is used (unless --noprepare is specified). Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in17
1 files changed, 9 insertions, 8 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index d5853ceb..53163a2a 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2205,14 +2205,15 @@ elif (( !REPKG )); then
fi
extract_sources
- if (( PKGVERFUNC )); then
- update_pkgver
- basever=$(get_full_version)
- check_build_status
- fi
- if (( PREPAREFUNC )); then
- run_prepare
- fi
+fi
+
+if (( PKGVERFUNC )); then
+ update_pkgver
+ basever=$(get_full_version)
+ check_build_status
+fi
+if (( PREPAREFUNC )); then
+ run_prepare
fi
if (( NOBUILD )); then