From owner-svn-src-all@FreeBSD.ORG  Mon Nov  1 01:51:48 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6282A106566C;
	Mon,  1 Nov 2010 01:51:48 +0000 (UTC)
	(envelope-from wollman@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 189328FC18;
	Mon,  1 Nov 2010 01:51:48 +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 oA11plQX019762;
	Mon, 1 Nov 2010 01:51:47 GMT (envelope-from wollman@svn.freebsd.org)
Received: (from wollman@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA11plGq019760;
	Mon, 1 Nov 2010 01:51:47 GMT (envelope-from wollman@svn.freebsd.org)
Message-Id: <201011010151.oA11plGq019760@svn.freebsd.org>
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Mon, 1 Nov 2010 01:51:47 +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: r214613 - head/usr.bin/locate/locate
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Nov 2010 01:51:48 -0000

Author: wollman
Date: Mon Nov  1 01:51:47 2010
New Revision: 214613
URL: http://svn.freebsd.org/changeset/base/214613

Log:
  jilles@ pointed out that using ${PRUNEDIRS:=".zfs"} in updatedb.sh
  made it impossible to override PRUNEDIRS to make it empty.  Use the
  non-colon form to only set PRUNEDIRS if it is completely unset.  (For
  parallelism, the other configuration defaults here could be done the
  same way, but that could be more obviously accomplished by disabling
  updatedb in periodic.conf, so leave them alone for now.)

Modified:
  head/usr.bin/locate/locate/updatedb.sh

Modified: head/usr.bin/locate/locate/updatedb.sh
==============================================================================
--- head/usr.bin/locate/locate/updatedb.sh	Mon Nov  1 01:03:05 2010	(r214612)
+++ head/usr.bin/locate/locate/updatedb.sh	Mon Nov  1 01:51:47 2010	(r214613)
@@ -52,7 +52,7 @@ PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; ex
 : ${FCODES:=/var/db/locate.database}	 # the database
 : ${SEARCHPATHS:="/"}		# directories to be put in the database
 : ${PRUNEPATHS:="/tmp /usr/tmp /var/tmp /var/db/portsnap"} # unwanted directories
-: ${PRUNEDIRS:=".zfs"}	# unwanted directories, in any parent
+: ${PRUNEDIRS=".zfs"}	# unwanted directories, in any parent
 : ${FILESYSTEMS:="$(lsvfs | tail -n +3 | \
 	egrep -vw "loopback|network|synthetic|read-only|0" | \
 	cut -d " " -f1)"}		# allowed filesystems