From owner-svn-src-user@FreeBSD.ORG  Mon Jun 11 08:52:21 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AC5D11065678;
	Mon, 11 Jun 2012 08:52:21 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 97ECA8FC14;
	Mon, 11 Jun 2012 08:52:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5B8qLTv054029;
	Mon, 11 Jun 2012 08:52:21 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5B8qLEI054027;
	Mon, 11 Jun 2012 08:52:21 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201206110852.q5B8qLEI054027@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 11 Jun 2012 08:52:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236883 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jun 2012 08:52:21 -0000

Author: dougb
Date: Mon Jun 11 08:52:21 2012
New Revision: 236883
URL: http://svn.freebsd.org/changeset/base/236883

Log:
  In multiport(), count the number of ports in worklist_tmp, then use that
  for the first progress update. The number might get revised due to the
  user opting out of an update that matches a glob pattern, but it's better
  than doing 1/1, 2/2, etc. in the first pass.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Jun 11 08:42:11 2012	(r236882)
+++ user/dougb/portmaster/portmaster	Mon Jun 11 08:52:21 2012	(r236883)
@@ -2730,6 +2730,7 @@ multiport () {
 		esac
 	done
 
+	numports=0
 	for port in $worklist_temp; do
 		check_exclude $port || continue
 		check_interactive $port || continue
@@ -2753,6 +2754,8 @@ multiport () {
 			fi
 		fi
 
+		numports=$(( $numports + 1 ))
+
 		worklist="$worklist $port"
 		portlist="${portlist}\t${port}\n"
 		PM_MULTI_PORTS="${PM_MULTI_PORTS}${port}:"
@@ -2784,7 +2787,7 @@ multiport () {
 
 	[ -n "$PM_URB" ] && export PM_URB
 
-	numports=0
+	num=0
 	for port in $worklist; do
 		case "$port" in
 		*/*)	origin=$port ;;
@@ -2793,8 +2796,8 @@ multiport () {
 
 		case "$PM_NEEDS_UPDATE" in *\ $origin\ *) continue ;; esac
 
-		numports=$(( $numports + 1 ))
-		init_term_printf "$port ${numports}/${numports}"
+		num=$(( $num + 1 ))
+		init_term_printf "$port ${num}/${numports}"
 		($0 $ARGS $port) || update_failed=update_failed
 		. $IPC_SAVE
 		[ -n "$update_failed" ] && fail "Update for $port failed"