From owner-svn-src-head@FreeBSD.ORG  Tue May  4 11:34:14 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E05151065676;
	Tue,  4 May 2010 11:34:14 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id C91078FC1B;
	Tue,  4 May 2010 11:34:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o44BYE77000727;
	Tue, 4 May 2010 11:34:14 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o44BYENg000724;
	Tue, 4 May 2010 11:34:14 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201005041134.o44BYENg000724@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 4 May 2010 11:34:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207613 - head/usr.bin/chpass
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 May 2010 11:34:15 -0000

Author: emaste
Date: Tue May  4 11:34:13 2010
New Revision: 207613
URL: http://svn.freebsd.org/changeset/base/207613

Log:
  Restore historical behaviour of only executing chflags on files that exist.
  This eliminates cosmetic errors of the form "chflags: ...: No such file or
  directory" during an installworld to an empty destination.

Modified:
  head/usr.bin/chpass/Makefile

Modified: head/usr.bin/chpass/Makefile
==============================================================================
--- head/usr.bin/chpass/Makefile	Tue May  4 11:25:04 2010	(r207612)
+++ head/usr.bin/chpass/Makefile	Tue May  4 11:34:13 2010	(r207613)
@@ -38,7 +38,9 @@ MLINKS+= chpass.1 ypchpass.1 chpass.1 yp
 
 beforeinstall:
 .for i in chpass chfn chsh ypchpass ypchfn ypchsh
+.if exists(${DESTDIR}${BINDIR}/$i)
 	-chflags noschg ${DESTDIR}${BINDIR}/$i
+.endif
 .endfor
 
 .if !defined(NO_FSCHG)