From owner-svn-src-user@FreeBSD.ORG  Sat Sep 10 08:00:27 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 44A7E106566C;
	Sat, 10 Sep 2011 08:00:27 +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 35E0C8FC13;
	Sat, 10 Sep 2011 08:00:27 +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 p8A80RLD075179;
	Sat, 10 Sep 2011 08:00:27 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8A80RZ0075177;
	Sat, 10 Sep 2011 08:00:27 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201109100800.p8A80RZ0075177@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 10 Sep 2011 08:00:27 +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: r225466 - 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, 10 Sep 2011 08:00:27 -0000

Author: dougb
Date: Sat Sep 10 08:00:26 2011
New Revision: 225466
URL: http://svn.freebsd.org/changeset/base/225466

Log:
  Add a more-or-less painless test to deal with the issue of the current
  working directory no longer existing. This problem usually manifests as
  a "The value of DISTDIR cannot be empty" error because 'make -f' does
  not handle this condition gracefully.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sat Sep 10 07:16:53 2011	(r225465)
+++ user/dougb/portmaster/portmaster	Sat Sep 10 08:00:26 2011	(r225466)
@@ -850,9 +850,16 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then
 		fi
 	fi
 
-	[ -z "$DISTDIR" -a "$PM_PACKAGES" != only -a -z "$CHECK_DEPENDS" -a \
-	    -z "$CHECK_PORT_DBDIR" -a -z "$LIST_ORIGINS" ] &&
-		DISTDIR=`pm_make_b -f/usr/share/mk/bsd.port.mk -V DISTDIR 2>/dev/null`
+	if [ -z "$DISTDIR" -a "$PM_PACKAGES" != only -a -z "$CHECK_DEPENDS" -a \
+	    -z "$CHECK_PORT_DBDIR" -a -z "$LIST_ORIGINS" ]; then
+		if ! DISTDIR=`pm_make_b -f/usr/share/mk/bsd.port.mk -V DISTDIR 2>/dev/null`; then
+			if [ ! -d "$PWD" ]; then
+				echo ''
+				echo "===>>> Your current working directory no longer seems to exist"
+				fail 'Try: cd'
+			fi
+		fi
+	fi
 
 	[ -n "$DISTDIR" ] && { DISTDIR="${DISTDIR%/}/"; export DISTDIR; }