From owner-svn-src-user@FreeBSD.ORG  Sat Oct 30 02:51:05 2010
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 0CDC4106566C;
	Sat, 30 Oct 2010 02:51:05 +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 F07028FC15;
	Sat, 30 Oct 2010 02:51:04 +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 o9U2p4dD075988;
	Sat, 30 Oct 2010 02:51:04 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9U2p47P075986;
	Sat, 30 Oct 2010 02:51:04 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201010300251.o9U2p47P075986@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 30 Oct 2010 02:51:04 +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: r214545 - 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: Sat, 30 Oct 2010 02:51:05 -0000

Author: dougb
Date: Sat Oct 30 02:51:04 2010
New Revision: 214545
URL: http://svn.freebsd.org/changeset/base/214545

Log:
  In --clean-packages handle lack of empty directories more cleanly

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sat Oct 30 01:24:26 2010	(r214544)
+++ user/dougb/portmaster/portmaster	Sat Oct 30 02:51:04 2010	(r214545)
@@ -1163,15 +1163,14 @@ if [ -n "$CLEAN_PACKAGES" ]; then
 	echo '' ; echo ''
 
 	empty_dirs=`find . -type d -empty -print | sort`
-	if [ -n "$empty_dirs" ]; then
-		echo "===>>> Deleting empty directories"
+	case "$empty_dirs" in
+	\.|'')	echo "===>>> No empty directories in $PACKAGES" ;;
+	*)	echo "===>>> Deleting empty directories"
 		for dir in $empty_dirs; do
 			echo "	===>>> ${dir#\.\/}"
 		done
-		pm_find_s . -type d -empty -delete
-	else
-		echo "===>>> No empty directories in $PACKAGES"
-	fi
+		pm_find_s . -type d -empty -delete ;;
+	esac
 	echo ''
 
 	safe_exit