Date: Sat, 10 Sep 2011 08:00:27 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r225466 - user/dougb/portmaster Message-ID: <201109100800.p8A80RZ0075177@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109100800.p8A80RZ0075177>