FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 09-23-2012, 02:44 PM
Allan McRae
 
Default 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
 

Thread Tools




All times are GMT. The time now is 04:33 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org