From d9f67bcb36290c03a4ecbd6b10718bbc27ca9bd1 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Tue, 5 Jun 2018 16:17:23 +0200
Subject: [PATCH] Revert "common/xbps: make unset_package_funcs and
 run_pkg_hooks nonfatal"

This reverts commit f3d4dc20d7be229c156b75cdebc04e6349004f9b.
---
 common/xbps-src/shutils/common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 57103421db8..58194a86241 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -255,7 +255,7 @@ run_pkg_hooks() {
 unset_package_funcs() {
     local f
 
-    for f in $(typeset -F|grep -E '_package$' || :); do
+    for f in $(typeset -F|grep -E '_package$'); do
         eval unset -f $f
     done
 }
@@ -263,7 +263,7 @@ unset_package_funcs() {
 get_subpkgs() {
     local args list
 
-    args="$(typeset -F|grep -E '_package$' || :)"
+    args="$(typeset -F|grep -E '_package$')"
     set -- ${args}
     while [ $# -gt 0 ]; do
         list+=" ${3%_package}"; shift 3