Date: Thu, 28 Apr 2011 05:48:33 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r221148 - user/dougb/portmaster Message-ID: <201104280548.p3S5mXkT007573@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Thu Apr 28 05:48:32 2011 New Revision: 221148 URL: http://svn.freebsd.org/changeset/base/221148 Log: In the event that an invalid combination of configuration options causes a port to be BROKEN, etc. it is useful to run --force-config and try again Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Thu Apr 28 03:33:12 2011 (r221147) +++ user/dougb/portmaster/portmaster Thu Apr 28 05:48:32 2011 (r221148) @@ -3116,9 +3116,17 @@ echo "===>>> Port directory: $pd/$portdi if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_ONLY" ]; then if [ -z "$PM_INDEX_ONLY" ]; then if ! check_state; then - echo " ===>>> If you are sure you can build it, remove the" - echo " $state line in the Makefile and try again." - safe_exit 1 + check_state_fail=check_state_fail + if [ -n "$PM_FORCE_CONFIG" ]; then + sleep 4 + make_config + check_state && unset check_state_fail + fi + if [ -n "$check_state_fail" ]; then + echo " ===>>> If you are sure you can build it, remove the" + echo " $state line in the Makefile and try again." + safe_exit 1 + fi fi fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104280548.p3S5mXkT007573>