diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-09-09 08:53:51 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-09-09 08:53:51 +0000 |
| commit | df39f942f985b443b70e231e1e8cbb7ca0c0f6ed (patch) | |
| tree | 6548d83d72e228345bff764cc6ca9f2b8f6ef798 /usr.sbin/sysmerge/sysmerge.sh | |
| parent | Various updates and corrections to SYNOPSIS, ERRORS, and STANDARDS (diff) | |
| download | wireguard-openbsd-df39f942f985b443b70e231e1e8cbb7ca0c0f6ed.tar.xz wireguard-openbsd-df39f942f985b443b70e231e1e8cbb7ca0c0f6ed.zip | |
'rm -f' in case we skip a release. No functional change, just cosmetic.
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.sh')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 16ff8a2b242..29d7d0571ce 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.187 2014/09/09 07:47:04 rpe Exp $ +# $OpenBSD: sysmerge.sh,v 1.188 2014/09/09 08:53:51 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -594,7 +594,8 @@ sm_post() { mtree -qdef /etc/mtree/BSD.x11.dist -p / -U >/dev/null if [[ -e ${_WRKDIR}/sysmerge.log ]]; then - rm ${_WRKDIR}/*sum + # XXX drop -f after OPENBSD_5_7 + rm -f ${_WRKDIR}/*sum sed '/^$/d' ${_WRKDIR}/sysmerge.log >${_WRKDIR}/sysmerge.log.bak mv ${_WRKDIR}/sysmerge.log.bak ${_WRKDIR}/sysmerge.log cd ${_WRKDIR} && \ |