From 09c583248e7c0aa5a833ec01262b8b4a7980234b Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Sun, 17 Jan 2016 16:10:31 -0500
Subject: Merge branch 'feature/improve-error-handling'

---
(limited to 'src/vardata.sh')

diff --git a/src/vardata.sh b/src/vardata.sh
index 05c9cff..6a7e749 100644
--- a/src/vardata.sh
+++ b/src/vardata.sh
@@ -36,12 +36,14 @@ init_vardata()
 	rand
 	vardatadir="${tmpdir}/${PACKAGE}-$(printf '%010d' ${rand_x})"
 	if ! mkdir "${vardatadir}"; then
-		error 2 "$(get_msg 'temp_mkdir_fail')" "${vardatadir}"
+		error "$(get_msg 'temp_mkdir_fail')" "${vardatadir}"
+		return 1
 	fi
 	for dir in ${VARDATA_DIRS}; do
 		if ! mkdir "${vardatadir}/${dir}"; then
-			error 2 "$(get_msg 'temp_mkdir_fail')" \
+			error "$(get_msg 'temp_mkdir_fail')" \
 				"${vardatadir}/${dir}"
+			return 1
 		fi
 	done
 
@@ -54,12 +56,14 @@ fini_vardata()
 
 	for dir in ${VARDATA_DIRS}; do
 		if ! rmdir "${vardatadir}/${dir}"; then
-			error 2 "$(get_msg 'temp_rmdir_fail')" \
+			error "$(get_msg 'temp_rmdir_fail')" \
 				"${vardatadir}/${dir}"
+			return 1
 		fi
 	done
 	if ! rmdir "${vardatadir}"; then
-		error 2 "$(get_msg 'temp_rmdir_fail')" "${vardatadir}"
+		error "$(get_msg 'temp_rmdir_fail')" "${vardatadir}"
+		return 1
 	fi
 
 	return 0
--
cgit v0.9.1