From owner-svn-ports-head@FreeBSD.ORG  Sat Mar  9 23:49:02 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id EE519C2D;
 Sat,  9 Mar 2013 23:49:02 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B1D63B9;
 Sat,  9 Mar 2013 23:49:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r29Nn28g059033;
 Sat, 9 Mar 2013 23:49:02 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r29Nn2bE059032;
 Sat, 9 Mar 2013 23:49:02 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201303092349.r29Nn2bE059032@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 9 Mar 2013 23:49:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313779 - head/Tools/scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Mar 2013 23:49:03 -0000

Author: bapt
Date: Sat Mar  9 23:49:02 2013
New Revision: 313779
URL: http://svnweb.freebsd.org/changeset/ports/313779

Log:
  Make check_deps behave the same as check_PRs:
  propose to skip removing a port if anything depends on it, instead of infinite looping on "ignore the issue"

Modified:
  head/Tools/scripts/rmport

Modified: head/Tools/scripts/rmport
==============================================================================
--- head/Tools/scripts/rmport	Sat Mar  9 23:36:46 2013	(r313778)
+++ head/Tools/scripts/rmport	Sat Mar  9 23:49:02 2013	(r313779)
@@ -184,36 +184,30 @@ check_dep()
 	persist=${2}
 	alltorm=${3}
 
-	while : ; do
-		log "${catport}: checking dependencies"
+	log "${catport}: checking dependencies"
 
-		err=0
+	err=0
 
-		res="`check_dep_core ${catport} "${alltorm}" 2>&1`" || err=1
+	res="`check_dep_core ${catport} "${alltorm}" 2>&1`" || err=1
 
-		if [ ${err} -eq 0 ] ; then
-			break
-		fi
+	if [ ${err} -eq 0 ] ; then
+		return 0
+	fi
 
-		echo "${res}" |${PAGER:-less}
+	echo "${res}" |${PAGER:-less}
 
-		if [ ${persist} -eq 0 ] ; then
-			break
-		fi
+	if [ ${persist} -eq 0 ] ; then
+		return 0
+	fi
 
-		echo "" >&2
-		echo "you can ignore the above issues and proceed anyway." >&2
-		echo "if this is the case, then either:" >&2
-		echo " * these are false positives" >&2
-		echo " * you want to break something" >&2
-		echo " * your ${PORTSDIR} is out of date, consider setting PORTSDIR in environment" >&2
-		echo "   to point to a newer instance of the ports tree" >&2
-		echo "or you can hit \`n' to repeat the check" >&2
-		answer=`ask "ignore the above issues"`
-		if [ "${answer}" = "y" ] ; then
-			break
-		fi
-	done
+	echo "" >&2
+	echo "you can skip ${catport} and continue with the rest or remove it anyway" >&2
+	answer=`ask "do you want to skip ${catport}?"`
+	if [ "${answer}" = "y" ] ; then
+		return 1
+	else
+		return 0
+	fi
 }
 
 # query GNATS via query-pr-summary.cgi, format and return the result
@@ -506,7 +500,9 @@ for catport in $* ; do
 	catport="${cat}/${port}"
 	pkgname=`pkgname ${catport}`
 
-	check_dep ${catport} 1 "${*}"
+	if ! check_dep ${catport} 1 "${*}" ; then
+		continue
+	fi
 
 	if ! check_PRs ${catport} ${port} ; then
 		continue