artulab
projects
/
openbsd
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
733b77e
)
sm_error() already does the exit for us.
author
ajacoutot
<ajacoutot@openbsd.org>
Tue, 13 Oct 2015 18:52:56 +0000
(18:52 +0000)
committer
ajacoutot
<ajacoutot@openbsd.org>
Tue, 13 Oct 2015 18:52:56 +0000
(18:52 +0000)
usr.sbin/sysmerge/sysmerge.sh
patch
|
blob
|
history
diff --git
a/usr.sbin/sysmerge/sysmerge.sh
b/usr.sbin/sysmerge/sysmerge.sh
index
8f6fdd1
..
6e9bedd
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
3 2015/10/12 18:25:1
6 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.21
4 2015/10/13 18:52:5
6 ajacoutot Exp $
#
# Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
@@
-47,7
+47,7
@@
sm_trap() {
sm_error
}
-trap "sm_trap
; exit 1
" 1 2 3 13 15
+trap "sm_trap" 1 2 3 13 15
sm_info() {
(($#)) && echo "---- Info: $@" || true