diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-01-27 17:40:42 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-01-27 17:40:42 +0000 |
| commit | a84c8b10d309e73803298b43db9b45caddbf9ac9 (patch) | |
| tree | 46d5a9eeaa36c8cb6616d2a7a08573c6f1bacb42 | |
| parent | Move "EDIT" to the top. (diff) | |
| download | wireguard-openbsd-a84c8b10d309e73803298b43db9b45caddbf9ac9.tar.xz wireguard-openbsd-a84c8b10d309e73803298b43db9b45caddbf9ac9.zip | |
Only remove COMPFILE if it exists.
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 52d9e14105f..d796e1a0fbf 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.115 2014/01/27 17:16:53 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.116 2014/01/27 17:40:42 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -576,7 +576,8 @@ sm_compare() { # only process them (i.e. install) if they don't exist on the target system if [ ! -s "${COMPFILE}" ]; then if [ -f "${DESTDIR}${COMPFILE#.}" ]; then - rm "${COMPFILE}" + # group and master.passwd are always in the _c1 list + [ -f "${COMPFILE}" ] && rm "${COMPFILE}" else IS_BINFILE=1 fi |