From cc3720b21451fbf73e0075b0955653fb37d1e106 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 18 Jun 2014 13:15:50 -0400 Subject: use abort() and die() from librelib --- db-functions | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'db-functions') 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 -- cgit v1.2.3-2-g168b