Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   ArchLinux Pacman Development (http://www.linux-archive.org/archlinux-pacman-development/)
-   -   makepkg: always run tidy_install on repackaging (http://www.linux-archive.org/archlinux-pacman-development/706642-makepkg-always-run-tidy_install-repackaging.html)

Allan McRae 09-23-2012 02:44 PM

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 enpty 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>
---
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()"
plain "$(gettext "File permissions may not be preserved.")"
- fi
fi
+ tidy_install
create_package
else
run_split_packaging
--
1.7.12.1


All times are GMT. The time now is 08:45 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.