artulab
projects
/
openbsd
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
93bdad7
)
Reverse the sm_error call in sm_trap.
author
ajacoutot
<ajacoutot@openbsd.org>
Mon, 12 Oct 2015 18:25:16 +0000
(18:25 +0000)
committer
ajacoutot
<ajacoutot@openbsd.org>
Mon, 12 Oct 2015 18:25:16 +0000
(18:25 +0000)
pointed out by semarie@... I need some sleep :/
usr.sbin/sysmerge/sysmerge.sh
patch
|
blob
|
history
diff --git
a/usr.sbin/sysmerge/sysmerge.sh
b/usr.sbin/sysmerge/sysmerge.sh
index
858f96f
..
8f6fdd1
100644
(file)
--- a/
usr.sbin/sysmerge/sysmerge.sh
+++ b/
usr.sbin/sysmerge/sysmerge.sh
@@
-1,6
+1,6
@@
#!/bin/ksh -
#
-# $OpenBSD: sysmerge.sh,v 1.21
2 2015/10/12 18:13:59
ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.21
3 2015/10/12 18:25:16
ajacoutot Exp $
#
# Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
@@
-43,8
+43,8
@@
sm_error() {
}
sm_trap() {
- sm_error
rm -f /var/sysmerge/{etc,pkg,xetc}sum
+ sm_error
}
trap "sm_trap; exit 1" 1 2 3 13 15