summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/sysmerge/sysmerge.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh
index df1d39f2ad0..514632d99ab 100644
--- a/usr.sbin/sysmerge/sysmerge.sh
+++ b/usr.sbin/sysmerge/sysmerge.sh
@@ -1,6 +1,6 @@
#!/bin/ksh -
#
-# $OpenBSD: sysmerge.sh,v 1.157 2014/08/30 14:40:09 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.158 2014/08/30 16:37:12 ajacoutot Exp $
#
# Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
@@ -66,7 +66,7 @@ sm_error() {
trap "sm_error; exit 1" 1 2 3 13 15
sm_warn() {
- (($#)) && sm_echo "**** WARNING: $@"
+ (($#)) && sm_echo "**** WARNING: $@" || true
}
sm_extract_mksum() {