summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-03-13 03:11:25 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-03-13 03:11:25 (EDT)
commite59f223d3376b94a31131d1c5b72ea37fda47a00 (patch)
tree2e2e278197ded0c6567763fbe6cd4bac53c7023f
parent74f1abf97030d1799ebaf9790d50c003408bd0a3 (diff)
ob_substvars(), ob_init_package(): Call _ob_error_msg()
-rw-r--r--TODO1
-rw-r--r--lib/control.sh2
-rw-r--r--lib/package.sh2
3 files changed, 2 insertions, 3 deletions
diff --git a/TODO b/TODO
index a106267..8c0fd41 100644
--- a/TODO
+++ b/TODO
@@ -41,7 +41,6 @@ Tasks
* In executables, print error (using `printf`) and exit if
`ob_set_text_domain()` fails.
* Make `set -e`.
- * Use `ob_error()` in libopkbuild in places where functions return on error.
* In executables, exit on errors.
Copyright
diff --git a/lib/control.sh b/lib/control.sh
index c29d4a0..f8bad2c 100644
--- a/lib/control.sh
+++ b/lib/control.sh
@@ -250,7 +250,7 @@ ob_substvars()
fi
if [ ${depth} -ge ${_OB_SUBSTVARS_MAX_DEPTH} ]; then
# Warn of possible recursion.
- _ob_warn_msg 'substvar_deep_nesting'
+ _ob_error_msg 'substvar_deep_nesting'
return 1
fi
old_rhs="${rhs}"
diff --git a/lib/package.sh b/lib/package.sh
index 1a07019..c2ffae2 100644
--- a/lib/package.sh
+++ b/lib/package.sh
@@ -39,7 +39,7 @@ ob_init_package()
fi
if [ -z "${_OB_PACKAGE_FORMAT}" ]; then
- _ob_warn_msg 'unable_to_detect_package_format'
+ _ob_error_msg 'unable_to_detect_package_format'
return 1
fi