From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 12 Oct 2015 18:25:16 +0000 (+0000)
Subject: Reverse the sm_error call in sm_trap.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0701bd0ea1edec7873e015903869f0cb2e7e237c;p=openbsd

Reverse the sm_error call in sm_trap.

pointed out by semarie@... I need some sleep :/
---

diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh
index 858f96fb5ea..8f6fdd16f2b 100644
--- a/usr.sbin/sysmerge/sysmerge.sh
+++ b/usr.sbin/sysmerge/sysmerge.sh
@@ -1,6 +1,6 @@
 #!/bin/ksh -
 #
-# $OpenBSD: sysmerge.sh,v 1.212 2015/10/12 18:13:59 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.213 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