diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2011-04-21 15:57:14 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2011-04-21 15:57:14 +0000 |
| commit | d33dd25d743ad0ff5f7fa6960bf2edc1ae9f5125 (patch) | |
| tree | 2e47cb4b37f1ba6873941f9971a3166b7a819a80 | |
| parent | Better detection of obsolete files (naddy@ reported a false positive). (diff) | |
| download | wireguard-openbsd-d33dd25d743ad0ff5f7fa6960bf2edc1ae9f5125.tar.xz wireguard-openbsd-d33dd25d743ad0ff5f7fa6960bf2edc1ae9f5125.zip | |
Oopsy.
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index e58de6fdcd4..cb0d60d155e 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.69 2011/04/21 15:54:24 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.70 2011/04/21 15:57:14 ajacoutot Exp $ # # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008, 2009, 2010 Antoine Jacoutot <ajacoutot@openbsd.org> @@ -133,7 +133,7 @@ do_populate() { awk '{ print $3 }' ${DESTDIR}/${DBDIR}/${i} | sed 's/^./X/;s/$/X/' > ${WRKDIR}/new awk '{ print $3 }' ${WRKDIR}/${i} | sed 's/^./X/;s/$/X/' > ${WRKDIR}/old if [ -n "`diff -q ${WRKDIR}/old ${WRKDIR}/new`" ]; then - local _diff=`grep -v -F ${WRKDIR}/old ${WRKDIR}/new | sed 's/^X//;s/X$//'` + local _diff=`grep -v -f ${WRKDIR}/old ${WRKDIR}/new | sed 's/^X//;s/X$//'` _obs="${_diff} ${_obs}" set -A OBSOLETE_FILES -- ${_obs} fi |