diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-03-22 12:26:03 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-03-22 12:26:03 +0000 |
| commit | 44dc51cba95554d7146cd742fc19366838181f33 (patch) | |
| tree | db3cc66b4c8649224cad72b1ab16fa20fddab851 | |
| parent | Unbreak tree; p_sigacts moved from struct proc to struct process (diff) | |
| download | wireguard-openbsd-44dc51cba95554d7146cd742fc19366838181f33.tar.xz wireguard-openbsd-44dc51cba95554d7146cd742fc19366838181f33.zip | |
Also remove TEMPROOT in error_rm_wrkdir.
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 3138cd60085..470391f08db 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.128 2014/03/22 11:16:42 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.129 2014/03/22 12:26:03 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -79,6 +79,7 @@ error_rm_wrkdir() { (($#)) && echo "**** ERROR: $@" # do not remove the entire WRKDIR in case sysmerge stopped half # way since it contains our backup files + rm -rf ${TEMPROOT} rm -f ${WRKDIR}/*.tgz rmdir ${WRKDIR} 2>/dev/null exit 1 |