From owner-svn-src-user@FreeBSD.ORG  Sun Jun 10 05:24:24 2012
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 E06FF106564A;
	Sun, 10 Jun 2012 05:24:24 +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 CC2488FC0C;
	Sun, 10 Jun 2012 05:24:24 +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 q5A5OOJT074812;
	Sun, 10 Jun 2012 05:24:24 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5A5OOYG074810;
	Sun, 10 Jun 2012 05:24:24 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201206100524.q5A5OOYG074810@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 10 Jun 2012 05:24:24 +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: r236831 - 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: Sun, 10 Jun 2012 05:24:25 -0000

Author: dougb
Date: Sun Jun 10 05:24:24 2012
New Revision: 236831
URL: http://svn.freebsd.org/changeset/base/236831

Log:
  Add a test for background clean processes to finish before emptying
  directories in WRKDIRPREFIX

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Jun 10 02:38:51 2012	(r236830)
+++ user/dougb/portmaster/portmaster	Sun Jun 10 05:24:24 2012	(r236831)
@@ -155,8 +155,20 @@ parent_exit () {
 	done
 
 	if [ -n "$PM_WRKDIRPREFIX" ]; then
+		count=0
+		while : ; do
+			pgrep -qf 'make clean NOCLEANDEPENDS=ncd' || break
+			count=$(( $count + 1 ))
+			if [ $count -eq 1 ]; then
+				echo "===>>> Waiting for background clean processes to finish"
+			elif [ $count -eq 10 ]; then
+				count=0
+			fi
+			sleep 2
+		done
+
 		pm_v "===>>> Removing empty directories from WRKDIRPREFIX"
-		find -d $PM_WRKDIRPREFIX -mindepth 1 -type d -empty -delete 2>/dev/null
+		find $PM_WRKDIRPREFIX -depth -mindepth 1 -type d -empty -delete 2>/dev/null
 	fi
 
 	case "$DISPLAY_LIST" in
@@ -3876,9 +3888,9 @@ if [ -n "$MAKE_PACKAGE" ]; then
 fi
 
 if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then
-	pm_sv Running \'make clean\' in the background
+	pm_v "===>>> Running 'make clean' in the background"
 	(pm_make_s clean NOCLEANDEPENDS=ncd2 >/dev/null)&
-	echo ''
+	pm_v
 fi
 
 check_dependency_files $portdir $new_port