diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2012-08-20 06:10:25 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2012-08-20 06:10:25 +0000 |
| commit | d658e16d122f86fda91f9defd3036423fe7df973 (patch) | |
| tree | b4c8154c67eb8284de8056fe1192ee3a204c932c | |
| parent | c5f9936c48fc556d3978e50f8d603be1e5ceed76 (diff) | |
Don't unset NEED_NEWALIASES too soon or we will not get the warning.
from robert at peichaer dot org
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index b8d7f519cb5..d618678b6c3 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.86 2012/08/04 09:55:29 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.87 2012/08/20 06:10:24 ajacoutot Exp $ # # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008, 2009, 2010, 2011 Antoine Jacoutot <ajacoutot@openbsd.org> @@ -595,7 +595,6 @@ do_post() { report "===> A new ${DESTDIR}/etc/mail/aliases file was installed." report "However ${DESTDIR}/usr/bin/newaliases could not be run," report "you will need to rebuild your aliases database manually.\n" - unset NEED_NEWALIASES fi FILES_IN_TEMPROOT=$(find ${TEMPROOT} -type f ! -name \*.merged -size +0 2>/dev/null) |