diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2009-06-28 21:08:07 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2009-06-28 21:08:07 +0000 |
| commit | cc247e21e9419465c1648fe0636fdc1f4663fbb8 (patch) | |
| tree | f0237930fb345576a9a2afbb427f0134fa9e8724 /usr.sbin/sysmerge/sysmerge.sh | |
| parent | 77d641717ce5e5626a6be071db3e4c02285748c3 (diff) | |
Fix small regression introduced with symlinks handling.
spotted by jmc@
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 896a6d2db9f..a37453136e3 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.46 2009/06/28 18:23:43 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.47 2009/06/28 21:08:06 ajacoutot Exp $ # # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008, 2009 Antoine Jacoutot <ajacoutot@openbsd.org> @@ -535,13 +535,13 @@ do_compare() { if [ "${AUTOMODE}" -a "${COMPFILE}" != "./etc/fbtab" \ -a "${COMPFILE}" != "./etc/login.conf" \ -a "${COMPFILE}" != "./etc/sysctl.conf" \ - -a "${COMPFILE}" != "./etc/ttys" ]; then + -a "${COMPFILE}" != "./etc/ttys" -a -z "${IS_LINK}" ]; then CVSID1=`grep "[$]OpenBSD:" ${DESTDIR}${COMPFILE#.} 2> /dev/null` CVSID2=`grep "[$]OpenBSD:" ${COMPFILE} 2> /dev/null` || CVSID2=none if [ "${CVSID2}" = "${CVSID1}" ]; then rm "${COMPFILE}"; fi fi - if [ -f "${COMPFILE}" ]; then + if [ -f "${COMPFILE}" -a -z "${IS_LINK}" ]; then # make sure files are different; if not, delete the one in temproot if diff -q "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > /dev/null 2>&1; then rm "${COMPFILE}" |