From e1e5ae15188307d55f10439431b47db0ba2b0e7d Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Wed, 13 Mar 2019 19:39:59 -0400
Subject: ob_parse_package_metadata(): Merge into ob_init_package()

Now that caching is gone, the ob_parse_package_metadata() interface
function is trivially short, and keeping it separate unnecessarily
complicates the API.
---
(limited to 'lib')

diff --git a/lib/package.sh b/lib/package.sh
index 6aa7b94..c684cc5 100644
--- a/lib/package.sh
+++ b/lib/package.sh
@@ -23,6 +23,16 @@ _OB_BINARY_PACKAGES=
 _OB_SOURCE_PARAMETERS=
 _OB_BINARY_PARAMETERS=
 
+_ob_package_do()
+{
+	local func="${1}"
+	shift 1 || _ob_abort
+
+	"_ob_${func}_${_OB_PACKAGE_FORMAT}" "${@}" || return ${?}
+
+	return 0
+}
+
 ob_init_package()
 {
 	local dir="${1}"
@@ -45,21 +55,6 @@ ob_init_package()
 
 	_OB_BINARY_PACKAGES=
 
-	return 0
-}
-
-_ob_package_do()
-{
-	local func="${1}"
-	shift 1 || _ob_abort
-
-	"_ob_${func}_${_OB_PACKAGE_FORMAT}" "${@}" || return ${?}
-
-	return 0
-}
-
-ob_parse_package_metadata()
-{
 	_ob_package_do 'parse_package_metadata' || return ${?}
 
 	return 0
--
cgit v0.9.1