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

makepkg: always run tidy_install on repackaging 

When using "makepkg -R" without a packge function, we should still
run tidy_install as the user might have added other packaging options
such as (e.g.) '!emptydir' to remove empty directories on repackaging.
Of course we can not revert some options when repackaging without a
package function.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2012-09-23 21:52:40 +10:00
parent a459156a4e
commit 7199fb3b1a
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/makepkg.sh.in
View File

@ -2687,7 +2687,6 @@ if (( INFAKEROOT )); then
if (( BUILDFUNC )); then
run_build
(( CHECKFUNC )) && run_check
tidy_install
fi
else
warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()"
@ -2695,8 +2694,8 @@ if (( INFAKEROOT )); then
fi
else
run_package
tidy_install
fi
tidy_install
create_package
else
run_split_packaging
@ -2828,15 +2827,11 @@ else
if (( ! SPLITPKG )); then
if (( PKGFUNC )); then
run_package
tidy_install
else
if (( ! REPKG )); then
tidy_install
else
elif (( REPKG )); then
warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()"
plain "$(gettext "File permissions may not be preserved.")"
fi
fi
tidy_install
create_package
else
run_split_packaging