svn commit: r222553 - user/dougb/portmaster

[Doug Barton]

Author: dougb
Date: Wed Jun  1 01:35:09 2011
New Revision: 222553
URL: http://svn.freebsd.org/changeset/base/222553

Log:
  The mere presence of IS_INTERACTIVE in the Makefile is not enough, the
  condition needs to be verified in case it is conditional
  
  PR:		ports/157481
  Submitted by:	Carl <k0802647 at telus.net>

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Wed Jun  1 01:32:58 2011	(r222552)
+++ user/dougb/portmaster/portmaster	Wed Jun  1 01:35:09 2011	(r222553)
@@ -3193,7 +3193,8 @@ if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUIL
 	fi
 
 	if [ -z "$FETCH_ONLY" -a ! "$PM_PACKAGES" = only ]; then
-		TESTINT=`grep -l ^IS_INTERACTIVE Makefile`
+		TESTINT=`grep -l ^IS_INTERACTIVE Makefile` &&
+		    TESTINT=`pm_make_b -V IS_INTERACTIVE`
 	else
 		[ -n "$ALL_FETCH" ] && safe_exit
 	fi