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 <[email protected]> --- scripts/makepkg.sh.in | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d5853ce..53163a2 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 -- 2.6.4
