[pacman-dev] [PATCHv4 3/3] makepkg: Comment on install_package() return code

[Pierre Neidhardt]

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 <ambrevar at gmail.com>
---
 scripts/makepkg.sh.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 6e634d9..111f01a 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2075,6 +2075,7 @@ create_srcpackage() {
 	rm -rf "${srclinks}"
 }
 
+# this function always returns 0 to make sure clean-up will still occur
 install_package() {
 	(( ! INSTALL )) && return
 
@@ -2410,7 +2411,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
@@ -2433,7 +2434,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
@@ -3097,6 +3098,6 @@ msg "$(gettext "Finished making: %s")" "$pkgbase $fullver ($(date))"
 
 install_package
 
-exit 0 #E_OK
+exit 0
 
 # vim: set noet:
-- 
1.9.0