diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2014-01-27 17:40:43 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2014-01-27 17:40:43 +0000 |
| commit | 240232e0fc7c9d12f2ce12062019e70f67653302 (patch) | |
| tree | 9cadb7ac0eb898e7880c370268b77e2c6623ec1b /usr.sbin/sysmerge | |
| parent | 58c9c3ce8772d01be085779d0cb21bedb2538ec3 (diff) | |
Only remove COMPFILE if it exists.
Diffstat (limited to 'usr.sbin/sysmerge')
| -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 |