moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

makepkg: do not run prepare() and pkgver() with --repackage 

Bug introduced with commit 8454daa7.

Reported-by: Zuyi Hu <hzy068808@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2016-01-25 15:23:16 +10:00
parent 765e29b67c
commit 47ea63ff3b
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/makepkg.sh.in
View File

@ -2192,28 +2192,30 @@ mkdir -p "$srcdir"
chmod a-s "$srcdir" chmod a-s "$srcdir"
cd_safe "$srcdir" cd_safe "$srcdir"
if (( NOEXTRACT && ! VERIFYSOURCE )); then if (( !REPKG )); then
warning "$(gettext "Using existing %s tree")" "\$srcdir/" if (( NOEXTRACT && ! VERIFYSOURCE )); then
elif (( !REPKG )); then warning "$(gettext "Using existing %s tree")" "\$srcdir/"
download_sources else
check_source_integrity download_sources
(( VERIFYSOURCE )) && exit 0 # $E_OK check_source_integrity
(( VERIFYSOURCE )) && exit 0 # $E_OK
if (( CLEANBUILD )); then if (( CLEANBUILD )); then
msg "$(gettext "Removing existing %s directory...")" "\$srcdir/" msg "$(gettext "Removing existing %s directory...")" "\$srcdir/"
rm -rf "$srcdir"/* rm -rf "$srcdir"/*
fi
extract_sources
fi fi
extract_sources if (( PKGVERFUNC )); then
fi update_pkgver
basever=$(get_full_version)
if (( PKGVERFUNC )); then check_build_status
update_pkgver fi
basever=$(get_full_version) if (( PREPAREFUNC )); then
check_build_status run_prepare
fi fi
if (( PREPAREFUNC )); then
run_prepare
fi fi
if (( NOBUILD )); then if (( NOBUILD )); then