diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-08-31 07:35:52 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-08-31 07:35:52 +0000 |
| commit | aa8505af40000ec7a0aefb735d4a9e0b1a11c6a4 (patch) | |
| tree | 728706f85142118d051e246b14fbce9521af69c7 | |
| parent | When we are not running in pkg mode, /usr/share/sysmerge/examplessum (diff) | |
| download | wireguard-openbsd-aa8505af40000ec7a0aefb735d4a9e0b1a11c6a4.tar.xz wireguard-openbsd-aa8505af40000ec7a0aefb735d4a9e0b1a11c6a4.zip | |
Only use the sum files corresponding to the mode we run in.
| -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 0e7255e4a53..29df39a0efa 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.161 2014/08/31 07:31:26 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.162 2014/08/31 07:35:52 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -192,9 +192,9 @@ sm_populate() { sm_check_an_eg sm_cp_pkg_samples - # examplessum is used differently, see sm_check_an_eg() for _i in etcsum xetcsum pkgsum; do - if [[ -f /usr/share/sysmerge/${_i} ]]; then + if [[ -f /usr/share/sysmerge/${_i} && \ + -f ${_TMPROOT}/usr/share/sysmerge/${_i} ]]; then # delete file in temproot if it has not changed since # last release and is present in current installation if [[ -z ${DIFFMODE} ]]; then |