summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-06-18 13:15:50 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-06-18 13:15:50 -0400
commitcc3720b21451fbf73e0075b0955653fb37d1e106 (patch)
tree4b4451355bc9b25e3a00bdae6024131128565861
parent457e2b0ab0870e19bcf9bdcdd88a2c338cc3bfd3 (diff)
use abort() and die() from librelib
-rw-r--r--db-functions14
1 files changed, 2 insertions, 12 deletions
diff --git a/db-functions b/db-functions
index a1e86d9..6bab5a0 100644
--- a/db-functions
+++ b/db-functions
@@ -29,8 +29,8 @@ WORKDIR=$(mktemp -dt "${0##*/}.XXXXXXXXXX")
LOCKS=()
REPO_MODIFIED=0
-# Used: plain, msg, msg2, warning, error, in_array, get_full_version
-# Overwritten: cleanup, abort, die
+# Used: plain, msg, msg2, warning, error, in_array, get_full_version, abort, die
+# Overwritten: cleanup
# Ignored: stat_busy, stat_done,
# setup_workdir, trab_abort, trap_exit,
# lock, slock, lock_close
@@ -88,16 +88,6 @@ cleanup() {
[ "$1" ] && exit "$1"
}
-abort() {
- msg 'Aborting...'
- cleanup 0
-}
-
-die() {
- error "$*"
- cleanup 1
-}
-
trap abort INT QUIT TERM HUP
trap cleanup EXIT