svn commit: r207220 - user/dougb/portmaster

[Doug Barton]

Author: dougb
Date: Mon Apr 26 04:32:29 2010
New Revision: 207220
URL: http://svn.freebsd.org/changeset/base/207220

Log:
  For the handling of no ORIGIN all_config() needs the same logic
  as the main parser.
  
  For the case of bsdpan port, or +IGNOREME, add $iport to $CUR_DEPS
  so that the user is not reprompted at build time.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Apr 26 03:16:00 2010	(r207219)
+++ user/dougb/portmaster/portmaster	Mon Apr 26 04:32:29 2010	(r207220)
@@ -2471,7 +2471,20 @@ all_config () {
 
 		case "$CUR_DEPS" in *:${iport}:*) continue ;; esac
 
-		origin=`origin_from_pdb $iport` || continue
+		origin=`origin_from_pdb $iport` || {
+			case "$?" in
+			3) ;;
+			2) [ -z "$PM_VERBOSE" ] &&
+				echo "	===>>> No ORIGIN for $iport, and +IGNOREME is present"
+				echo "	===>>> Skipping"
+				echo '' ;;
+			*)	fail 'Cannot continue' ;;
+			esac;
+
+			# Prevent the user from getting reprompted during build
+			CUR_DEPS="${CUR_DEPS}${iport}:";
+			continue; }
+
 		case "$CONFIG_SEEN_LIST" in *:${origin}:*) continue ;; esac
 
 		[ -n "$PM_BUILD_ONLY_LIST" ] &&