diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2014-03-22 12:33:37 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2014-03-22 12:33:37 +0000 |
| commit | f7b5d9c7f8d2ac74029aeb097b780f3db9e205b7 (patch) | |
| tree | 3d41551ba23d8a436ef2403356338b8e52b507d2 | |
| parent | d8e8261fb4a750e226ac4ca9c95da9325759b3a9 (diff) | |
Fix trap: do not remove the entire WRKDIR -- we may have our backed up files
in there.
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 470391f08db..cc4c8078517 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.129 2014/03/22 12:26:03 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.130 2014/03/22 12:33:36 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -85,7 +85,7 @@ error_rm_wrkdir() { exit 1 } -trap "restore_sum; clean_src; rm -rf ${WRKDIR}; exit 1" 1 2 3 13 15 +trap "restore_sum; clean_src; error_rm_wrkdir; exit 1" 1 2 3 13 15 if (($(id -u) != 0)); then usage |