summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2010-04-14 16:22:43 +1000
committerDan McGee <dan@archlinux.org>2010-04-26 18:46:41 -0500
commit6995aed9aeae1e95d9de3b2f539f904dbde4e165 (patch)
treef0d97caa5bf2c81a0c2ebe929e06ebe3bf8b7c81
parent7608dd74d73b66595ad34c861491fc86be335e8c (diff)
makepkg: deprecate repackaging without a package function
File permissions are not guaranteed to stay the same on exit from fakeroot, so repackaging may result in files with different permissions. This is avoided when using a package() function (or split packages) as the packaging step is rerun. Signed-off-by: Allan McRae <allan@archlinux.org> [Dan: touched up message for translation purposes] Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in20
1 files changed, 15 insertions, 5 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 131519f6..ba7780fb 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1820,9 +1820,14 @@ fi
if (( INFAKEROOT )); then
if (( ! SPLITPKG )); then
if (( ! PKGFUNC )); then
- if (( BUILDFUNC && ! REPKG )); then
- run_build
- tidy_install
+ if (( ! REPKG )); then
+ if (( BUILDFUNC )); then
+ run_build
+ tidy_install
+ fi
+ else
+ warning "$(gettext "Repackaging without the use of a package() function is deprecated.")"
+ plain "$(gettext "File permissions may not be preserved.")"
fi
else
run_package
@@ -1939,8 +1944,13 @@ else
if (( PKGFUNC )); then
run_package
tidy_install
- elif (( ! REPKG )); then
- tidy_install
+ else
+ if (( ! REPKG )); then
+ tidy_install
+ else
+ warning "$(gettext "Repackaging without the use of a package() function is deprecated.")"
+ plain "$(gettext "File permissions may not be preserved.")"
+ fi
fi
create_package
else