moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

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

Browse Source 
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

14
scripts/makepkg.sh.in
View File

@ -2192,9 +2192,10 @@ mkdir -p "$srcdir"
chmod a-s "$srcdir" chmod a-s "$srcdir"
cd_safe "$srcdir" cd_safe "$srcdir"
if (( NOEXTRACT && ! VERIFYSOURCE )); then if (( !REPKG )); then
if (( NOEXTRACT && ! VERIFYSOURCE )); then
warning "$(gettext "Using existing %s tree")" "\$srcdir/" warning "$(gettext "Using existing %s tree")" "\$srcdir/"
elif (( !REPKG )); then else
download_sources download_sources
check_source_integrity check_source_integrity
(( VERIFYSOURCE )) && exit 0 # $E_OK (( VERIFYSOURCE )) && exit 0 # $E_OK
@ -2205,15 +2206,16 @@ elif (( !REPKG )); then
fi fi
extract_sources extract_sources
fi fi
if (( PKGVERFUNC )); then if (( PKGVERFUNC )); then
update_pkgver update_pkgver
basever=$(get_full_version) basever=$(get_full_version)
check_build_status check_build_status
fi fi
if (( PREPAREFUNC )); then if (( PREPAREFUNC )); then
run_prepare run_prepare
fi
fi fi
if (( NOBUILD )); then if (( NOBUILD )); then