summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-11-16 21:41:05 (EST)
committer P. J. McDermott <pjm@nac.net>2012-11-16 21:41:05 (EST)
commit8dd4fca6f45221a3cbae4b7c9bfbe629615839fe (patch)
treec6e331ea02fca8fee031f971e6406fa0bf98d825
parentca617f3a0b1c5b0516128e143c0352a204ccadea (diff)
Exit on failure to parse package metadata.
-rw-r--r--src/ob-applypatches.sh4
-rw-r--r--src/ob-buildenv.sh4
-rw-r--r--src/ob-buildopk.sh4
-rw-r--r--src/ob-checkbuilddeps.sh4
-rw-r--r--src/ob-gencontrol.sh4
-rw-r--r--src/ob-installdocs.sh4
-rw-r--r--src/ob-installplatconf.sh4
-rw-r--r--src/ob-unpacksource.sh4
-rw-r--r--src/opkbuild.sh4
9 files changed, 18 insertions, 18 deletions
diff --git a/src/ob-applypatches.sh b/src/ob-applypatches.sh
index 8a314cb..66f41da 100644
--- a/src/ob-applypatches.sh
+++ b/src/ob-applypatches.sh
@@ -29,8 +29,8 @@ main()
{
ob_set_text_domain 'opkbuild'
- ob_init_package '..'
- ob_parse_package_metadata -c '.opkbuild.cache'
+ ob_init_package '..' || exit 1
+ ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
apply_patches
}
diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh
index ad28fad..1cfa66c 100644
--- a/src/ob-buildenv.sh
+++ b/src/ob-buildenv.sh
@@ -30,8 +30,8 @@ main()
{
ob_set_text_domain 'opkbuild'
- ob_init_package '..'
- ob_parse_package_metadata -c '.opkbuild.cache'
+ ob_init_package '..' || exit 1
+ ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
ob_info "$(ob_get_msg 'setup_build_env')"
diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh
index 8aebaac..4f947f8 100644
--- a/src/ob-buildopk.sh
+++ b/src/ob-buildopk.sh
@@ -29,8 +29,8 @@ main()
{
ob_set_text_domain 'opkbuild'
- ob_init_package '..'
- ob_parse_package_metadata -c '.opkbuild.cache'
+ ob_init_package '..' || exit 1
+ ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
echo '2.0' >'debian-binary'
if [ -n "${OB_DO_SOURCE}" ]; then
diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh
index 6319576..1c39067 100644
--- a/src/ob-checkbuilddeps.sh
+++ b/src/ob-checkbuilddeps.sh
@@ -29,8 +29,8 @@ main()
{
ob_set_text_domain 'opkbuild'
- ob_init_package '..'
- ob_parse_package_metadata -c '.opkbuild.cache'
+ ob_init_package '..' || exit 1
+ ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
ob_info "$(ob_get_msg 'checking_build_deps')"
}
diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh
index d56973f..16eec5d 100644
--- a/src/ob-gencontrol.sh
+++ b/src/ob-gencontrol.sh
@@ -30,8 +30,8 @@ main()
{
ob_set_text_domain 'opkbuild'
- ob_init_package '..'
- ob_parse_package_metadata -c '.opkbuild.cache'
+ ob_init_package '..' || exit 1
+ ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
if [ -n "${OB_DO_SOURCE}" ]; then
gen_control "src-${OPK_SOURCE}" "${OPK_SOURCE_VERSION}" 'src' 'all' \
diff --git a/src/ob-installdocs.sh b/src/ob-installdocs.sh
index dfd5b70..d415909 100644
--- a/src/ob-installdocs.sh
+++ b/src/ob-installdocs.sh
@@ -29,8 +29,8 @@ main()
{
ob_set_text_domain 'opkbuild'
- ob_init_package '..'
- ob_parse_package_metadata -c '.opkbuild.cache'
+ ob_init_package '..' || exit 1
+ ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
doc_pkg="$(ob_get_doc_package)"
if [ ${?} -ne 0 ]; then
diff --git a/src/ob-installplatconf.sh b/src/ob-installplatconf.sh
index 4acaf3b..9458f91 100644
--- a/src/ob-installplatconf.sh
+++ b/src/ob-installplatconf.sh
@@ -32,8 +32,8 @@ main()
{
ob_set_text_domain 'opkbuild'
- ob_init_package '..'
- ob_parse_package_metadata -c '.opkbuild.cache'
+ ob_init_package '..' || exit 1
+ ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
copied='false'
diff --git a/src/ob-unpacksource.sh b/src/ob-unpacksource.sh
index 2454189..78ed4e0 100644
--- a/src/ob-unpacksource.sh
+++ b/src/ob-unpacksource.sh
@@ -34,8 +34,8 @@ main()
{
ob_set_text_domain 'opkbuild'
- ob_init_package '..'
- ob_parse_package_metadata -c '.opkbuild.cache'
+ ob_init_package '..' || exit 1
+ ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
if [ -d 'src' ]; then
ob_info "$(ob_get_msg 'already_unpacked')"
diff --git a/src/opkbuild.sh b/src/opkbuild.sh
index 59addf1..c6f6fc7 100644
--- a/src/opkbuild.sh
+++ b/src/opkbuild.sh
@@ -245,8 +245,8 @@ setup_package()
{
ob_info "$(ob_get_msg 'parse_package_metadata')"
- ob_init_package '..'
- ob_parse_package_metadata -c '.opkbuild.cache'
+ ob_init_package '..' || exit 1
+ ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
OPK_SOURCE="$(ob_get_source_parameter 'Source')"
OPK_SOURCE_VERSION="$(ob_get_source_parameter 'Version')"