From owner-svn-src-projects@FreeBSD.ORG  Thu Jan 29 09:13:35 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A7F9466F;
 Thu, 29 Jan 2015 09:13:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 94A21A68;
 Thu, 29 Jan 2015 09:13:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0T9DZlY003429;
 Thu, 29 Jan 2015 09:13:35 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0T9DZ4g003428;
 Thu, 29 Jan 2015 09:13:35 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201501290913.t0T9DZ4g003428@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 29 Jan 2015 09:13:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r277875 - projects/building-blocks/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jan 2015 09:13:35 -0000

Author: ngie
Date: Thu Jan 29 09:13:34 2015
New Revision: 277875
URL: https://svnweb.freebsd.org/changeset/base/277875

Log:
  Look for ! -type d when looking for OLD_FILES, not just -type f
  
  This will catch MLINKS, etc not caught previously

Modified:
  projects/building-blocks/tools/add-optional-obsolete-files-entries.sh

Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh
==============================================================================
--- projects/building-blocks/tools/add-optional-obsolete-files-entries.sh	Thu Jan 29 09:06:21 2015	(r277874)
+++ projects/building-blocks/tools/add-optional-obsolete-files-entries.sh	Thu Jan 29 09:13:34 2015	(r277875)
@@ -48,7 +48,7 @@ done
 
 # Enumerate all of the installed files/directories
 (cd $DESTDIR;
- find -s . -type f -mindepth 1 | \
+ find -s . \! -type d -and -mindepth 1 | \
     sed -e 's,^,OLD_FILES+=,' \
         -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g';
  find -d -s . -type d -mindepth 1 -and \! -empty | \