From 204158682910556b3e5e53906dcfaf063ab0e195 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 5 Mar 2014 10:45:22 +0100 Subject: makepkg: Comment on install_package() return code Previously, install_package() return code was either used as exit code or ignored. This was rather confusing. The return code is now always ignored and a comment on install_package() has been added. Signed-off-by: Pierre Neidhardt Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e230c152..20c7243a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2072,6 +2072,7 @@ create_srcpackage() { rm -rf "${srclinks}" } +# this function always returns 0 to make sure clean-up will still occur install_package() { (( ! INSTALL )) && return @@ -2407,7 +2408,7 @@ check_build_status() { if (( INSTALL )); then warning "$(gettext "A package has already been built, installing existing package...")" install_package - exit $? + exit 0 else error "$(gettext "A package has already been built. (use %s to overwrite)")" "-f" exit 1 @@ -2430,7 +2431,7 @@ check_build_status() { if (( INSTALL )); then warning "$(gettext "The package group has already been built, installing existing packages...")" install_package - exit $? + exit 0 else error "$(gettext "The package group has already been built. (use %s to overwrite)")" "-f" exit 1 -- cgit v1.2.3-70-g09d2