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/metadata.sh')

diff --git a/lib/metadata.sh b/lib/metadata.sh
index c6f5a16..e22a6e7 100644
--- a/lib/metadata.sh
+++ b/lib/metadata.sh
@@ -22,9 +22,9 @@ _ob_metadata_do()
 	local func="${1}"
 	shift 1 || _ob_abort
 
-	"_ob_${func}" "${@}"
+	"_ob_${func}" "${@}" || return ${?}
 
-	return ${?}
+	return 0
 }
 
 ## @brief Validate a source package name
@@ -39,9 +39,9 @@ ob_validate_source_name()
 	local name="${1}"
 	shift 1 || _ob_abort
 
-	_ob_metadata_do 'validate_source_name' "${name}"
+	_ob_metadata_do 'validate_source_name' "${name}" || return ${?}
 
-	return ${?}
+	return 0
 }
 
 ## @brief Validate a binary package name
@@ -56,9 +56,9 @@ ob_validate_binary_name()
 	local name="${1}"
 	shift 1 || _ob_abort
 
-	_ob_metadata_do 'validate_binary_name' "${name}"
+	_ob_metadata_do 'validate_binary_name' "${name}" || return ${?}
 
-	return ${?}
+	return 0
 }
 
 ## @brief Parse a source package version
@@ -136,9 +136,9 @@ ob_parse_version()
 ## @pure yes This function has no side effects.
 ob_get_system_arch()
 {
-	_ob_metadata_do 'get_system_arch'
+	_ob_metadata_do 'get_system_arch' || return ${?}
 
-	return ${?}
+	return 0
 }
 
 ## @brief Get the running system's platform
@@ -151,9 +151,9 @@ ob_get_system_arch()
 ## @pure yes This function has no side effects.
 ob_get_system_plat()
 {
-	_ob_metadata_do 'get_system_plat'
+	_ob_metadata_do 'get_system_plat' || return ${?}
 
-	return ${?}
+	return 0
 }
 
 ob_match_arch()
@@ -328,7 +328,7 @@ ob_get_system_path()
 	local path_id="${1}"
 	shift 1 || _ob_abort
 
-	_ob_metadata_do 'get_system_path' "${path_id}" "${@}"
+	_ob_metadata_do 'get_system_path' "${path_id}" "${@}" || return ${?}
 
-	return ${?}
+	return 0
 }
--
cgit v0.9.1