On Mon, Sep 24, 2012 at 12:44:29AM +1000, Allan McRae wrote: > 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 enpty directories on repackaging. > Of course we can not revert some options when repackaging without a > package function.
Ack, assuming you fix the typos in the commit message. > Signed-off-by: Allan McRae <[email protected]> > --- > scripts/makepkg.sh.in | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in > index d387b7d..40e8c2f 100644 > --- a/scripts/makepkg.sh.in > +++ b/scripts/makepkg.sh.in > @@ -2669,7 +2669,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()" > @@ -2677,8 +2676,8 @@ if (( INFAKEROOT )); then > fi > else > run_package > - tidy_install > fi > + tidy_install > create_package > else > run_split_packaging > @@ -2808,15 +2807,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()" Isn't it time we made this an error? > plain "$(gettext "File permissions may > not be preserved.")" > - fi > fi > + tidy_install > create_package > else > run_split_packaging > -- > 1.7.12.1 > >
