diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2009-06-04 23:24:18 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2009-06-04 23:24:18 +0000 |
| commit | b6f8c7be5956cd40a2988741b422f00bed6fe202 (patch) | |
| tree | eba42abbc70c9f600212f992445c1f221626995c | |
| parent | a367dac384aad15eb8d74730ff0eae5564e45355 (diff) | |
When in auto-mode, automatically install binary files (from the X set).
``please put it in'', pyr@
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 6 | ||||
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index ae7962913b9..71862a25ec8 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.24 2009/05/12 20:58:15 jmc Exp $ +.\" $OpenBSD: sysmerge.8,v 1.25 2009/06/04 23:24:17 ajacoutot Exp $ .\" .\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: May 12 2009 $ +.Dd $Mdocdate: June 4 2009 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -103,7 +103,7 @@ Automatic mode. only compares files whose reference sources have changed since the last run and attempts to automatically upgrade them to the newest version, provided that they have no local changes. -It automatically installs missing files +It automatically installs missing files, binaries and updates files differing only by CVS Id. .Pp Files whose reference sources have matching CVS Id are skipped from comparison. diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 7ac9ec19164..60494a71ac6 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.42 2009/05/13 22:27:48 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.43 2009/06/04 23:24:17 ajacoutot Exp $ # # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008, 2009 Antoine Jacoutot <ajacoutot@openbsd.org> @@ -377,8 +377,8 @@ diff_loop() { FORCE_UPG=1 fi done - # automatically install files which differ only by CVS Id - if [ -z "`diff -q -I'[$]OpenBSD:.*$' "${DESTDIR}${COMPFILE#.}" "${COMPFILE}"`" -o -n "${FORCE_UPG}" ]; then + # automatically install files which differ only by CVS Id or that are binaries + if [ -z "`diff -q -I'[$]OpenBSD:.*$' "${DESTDIR}${COMPFILE#.}" "${COMPFILE}"`" -o -n "${FORCE_UPG}" -o -n "${IS_BINFILE}" ]; then if mm_install "${COMPFILE}"; then echo "===> ${COMPFILE} installed successfully" AUTO_INSTALLED_FILES="${AUTO_INSTALLED_FILES}${DESTDIR}${COMPFILE#.}\n" |