summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-01-13 23:52:38 -0500
committerAllan McRae <allan@archlinux.org>2018-01-19 12:05:18 +1000
commit19dabcc19a476735c4273e7ba4a0a7437d83078f (patch)
tree16b07cdbf2319b0415890e85734e8bcbf3313ad3
parentb2e088e42cfb5be2ed7247040a50acf92916d1c2 (diff)
downloadpacman-19dabcc19a476735c4273e7ba4a0a7437d83078f.tar.gz
pacman-19dabcc19a476735c4273e7ba4a0a7437d83078f.zip
Fix usage of install_package
In commit ab2be5794de8a57426ec3fc0f631cc766a0b8227 return codes were implemented, and the output of install_package was improperly assigned to a variable when the return code was wanted. All we need to do is restore the previous exit handling, but return $? instead of hardcoding "0". Reported-by: xftroxgpx <xftroxgpx@protonmail.com> Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index a74e7b39..63b6c3e1 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1069,8 +1069,8 @@ check_build_status() {
&& ! (( FORCE || SOURCEONLY || NOBUILD || NOARCHIVE)); then
if (( INSTALL )); then
warning "$(gettext "A package has already been built, installing existing package...")"
- status=$(install_package)
- exit $status
+ install_package
+ exit $?
else
error "$(gettext "A package has already been built. (use %s to overwrite)")" "-f"
exit $E_ALREADY_BUILT
@@ -1092,8 +1092,8 @@ check_build_status() {
if (( allpkgbuilt )); then
if (( INSTALL )); then
warning "$(gettext "The package group has already been built, installing existing packages...")"
- status=$(install_package)
- exit $status
+ install_package
+ exit $?
else
error "$(gettext "The package group has already been built. (use %s to overwrite)")" "-f"
exit $E_ALREADY_BUILT