From owner-svn-src-user@FreeBSD.ORG  Tue May 10 07:12:12 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CB389106566C;
	Tue, 10 May 2011 07:12:11 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BCEEA8FC16;
	Tue, 10 May 2011 07:12:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4A7CBsl031517;
	Tue, 10 May 2011 07:12:11 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4A7CBFI031515;
	Tue, 10 May 2011 07:12:11 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201105100712.p4A7CBFI031515@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 10 May 2011 07:12:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221725 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 May 2011 07:12:12 -0000

Author: dougb
Date: Tue May 10 07:12:11 2011
New Revision: 221725
URL: http://svn.freebsd.org/changeset/base/221725

Log:
  Small refinement for unlink'ing, in parent_exit the glob pattern in the
  for loop will return 'pattern-*' if there are no matches, so test for
  that specifically rather than returning to the conditional version.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Tue May 10 05:33:37 2011	(r221724)
+++ user/dougb/portmaster/portmaster	Tue May 10 07:12:11 2011	(r221725)
@@ -145,7 +145,10 @@ parent_exit () {
 		pm_rmdir_s $pbu
 	fi
 
-	for f in ${TMPDIR}/f-${PM_PARENT_PID}-*; do /bin/unlink $f ; done
+	for f in ${TMPDIR}/f-${PM_PARENT_PID}-*; do
+		case "$f" in */f-${PM_PARENT_PID}-\*) continue ;; esac
+		/bin/unlink $f
+	done
 
 	[ -n "$PM_WRKDIRPREFIX" ] &&
 		find -d $PM_WRKDIRPREFIX -mindepth 1 -type d -empty -delete 2>/dev/null