diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2016-04-26 11:19:35 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2016-04-26 11:19:35 +0000 |
| commit | ac69ad0629e7ba995c5f2811f13ce76ff3314108 (patch) | |
| tree | 74a1215c19dd1931793c870527c34e48892e5730 /usr.sbin/sysmerge/sysmerge.sh | |
| parent | Drop an unused workaround which does not even compile. (diff) | |
| download | wireguard-openbsd-ac69ad0629e7ba995c5f2811f13ce76ff3314108.tar.xz wireguard-openbsd-ac69ad0629e7ba995c5f2811f13ce76ff3314108.zip | |
Tweak output a bit; to be improved probably (sthen@ and I can't think of a
better wording for now).
Also be consistent in batch and interactive mode: make sure we can just re-run
sysmerge if we leave a file for later; this prevents having to save the tmpdir
to find which files needs to be handled (aka we are self-contained).
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.sh')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 03313de8518..2e502462ee0 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.221 2016/02/02 07:02:32 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.222 2016/04/26 11:19:35 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -588,8 +588,8 @@ sm_post() { if [[ -d ${_TMPROOT} ]]; then for _f in $(find ${_TMPROOT} ! -type d ! -name \*.merged -size +0) do - sm_info "${_f} left for comparison" - ${BATCHMODE} && [[ -f ${_f} ]] && \ + sm_info "${_f##*${_TMPROOT}} unhandled, re-run ${0##*/} to merge the new version" + ! ${DIFFMODE} && [[ -f ${_f} ]] && \ sed -i "/$(sha256 -q ${_f})/d" /var/sysmerge/*sum done fi |