From 8173bcbcc3a05333979b0da0a765b4dedde7448e Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Wed, 13 Mar 2019 03:54:58 -0400
Subject: Don't let libopkbuild errors cause exit with -e

---
(limited to 'lib/package.sh')

diff --git a/lib/package.sh b/lib/package.sh
index c2ffae2..aa1a9a3 100644
--- a/lib/package.sh
+++ b/lib/package.sh
@@ -53,9 +53,9 @@ _ob_package_do()
 	local func="${1}"
 	shift 1 || _ob_abort
 
-	"_ob_${func}_${_OB_PACKAGE_FORMAT}" "${@}"
+	"_ob_${func}_${_OB_PACKAGE_FORMAT}" "${@}" || return ${?}
 
-	return ${?}
+	return 0
 }
 
 ob_parse_package_metadata()
@@ -252,9 +252,9 @@ ob_get_binary_parameter()
 
 ob_get_doc_package()
 {
-	_ob_package_do 'get_doc_package'
+	_ob_package_do 'get_doc_package' || return ${?}
 
-	return ${?}
+	return 0
 }
 
 ob_get_doc_files()
@@ -263,9 +263,9 @@ ob_get_doc_files()
 	local plat="${2}"
 	shift 2 || _ob_abort
 
-	_ob_package_do 'get_doc_files' "${arch}" "${plat}"
+	_ob_package_do 'get_doc_files' "${arch}" "${plat}" || return ${?}
 
-	return ${?}
+	return 0
 }
 
 ob_summarize_package_arch()
@@ -287,9 +287,9 @@ ob_set_package_substvars()
 	local pkg="${1}"
 	shift 1 || _ob_abort
 
-	_ob_package_do 'set_package_substvars' "${pkg}"
+	_ob_package_do 'set_package_substvars' "${pkg}" || return ${?}
 
-	return ${?}
+	return 0
 }
 
 _ob_set_binary_packages()
--
cgit v0.9.1