diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2012-08-04 09:55:30 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2012-08-04 09:55:30 +0000 |
| commit | dad1d3ca0c9873b7314f492e48a3327c7363ad48 (patch) | |
| tree | 556696936b137ed56ed7f4eab16d3718501f6bb7 /usr.sbin | |
| parent | 2694cb06082b9f9e9fd182a87d54a48eb401d999 (diff) | |
Also log the file(s) we manually merged/installed as it's important
information.
ok sthen@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 464e01fbe22..b8d7f519cb5 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.85 2012/08/04 07:02:14 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.86 2012/08/04 09:55:29 ajacoutot Exp $ # # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008, 2009, 2010, 2011 Antoine Jacoutot <ajacoutot@openbsd.org> @@ -484,13 +484,15 @@ diff_loop() { if [ -n "${IS_LINK}" ]; then if mm_install_link; then echo "===> ${COMPFILE#.} link created successfully" - AUTO_INSTALLED_FILES="${AUTO_INSTALLED_FILES}${DESTDIR}${COMPFILE#.}\n" + MERGED_FILES="${MERGED_FILES}${DESTDIR}${COMPFILE#.}\n" else warn "problem creating ${COMPFILE#.} link" fi else echo -n "===> Updating ${COMPFILE#.}" - if ! mm_install "${COMPFILE}"; then + if mm_install "${COMPFILE}"; then + MERGED_FILES="${MERGED_FILES}${DESTDIR}${COMPFILE#.}\n" + else warn "problem updating ${COMPFILE#.}" fi fi @@ -502,7 +504,9 @@ diff_loop() { ;; [mM]) if [ -z "${NO_INSTALLED}" -a -z "${IS_BINFILE}" -a -z "${IS_LINK}" ]; then - merge_loop || HANDLE_COMPFILE="todo" + merge_loop && \ + MERGED_FILES="${MERGED_FILES}${DESTDIR}${COMPFILE#.}\n" || \ + HANDLE_COMPFILE="todo" else echo "invalid choice: ${HANDLE_COMPFILE}\n" HANDLE_COMPFILE="todo" @@ -600,6 +604,10 @@ do_post() { report "===> Automatically installed file(s)" report "${AUTO_INSTALLED_FILES}" fi + if [ "${MERGED_FILES}" ]; then + report "===> Manually merged/installed file(s)" + report "${MERGED_FILES}" + fi if [ "${FILES_IN_BKPDIR}" ]; then report "===> Backup of replaced file(s) can be found under" report "${BKPDIR}\n" |