From owner-svn-src-user@FreeBSD.ORG  Mon Oct 31 02:43:36 2011
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 70AAF106566B;
	Mon, 31 Oct 2011 02:43:36 +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 612B08FC13;
	Mon, 31 Oct 2011 02:43:36 +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 p9V2ha5G095402;
	Mon, 31 Oct 2011 02:43:36 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9V2haVw095400;
	Mon, 31 Oct 2011 02:43:36 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201110310243.p9V2haVw095400@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 31 Oct 2011 02:43:36 +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: r226955 - 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, 31 Oct 2011 02:43:36 -0000

Author: dougb
Date: Mon Oct 31 02:43:36 2011
New Revision: 226955
URL: http://svn.freebsd.org/changeset/base/226955

Log:
  If an update fails in a child port the parent needs to source the $IPC_SAVE
  file before it bails out to make sure that various lists are updated in the
  parent. This is particularly important for the list(s) of work already
  completed, and especially to update PM_NEEDS_UPDATE for the message of how
  to resume from the point of failure.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Oct 31 00:10:11 2011	(r226954)
+++ user/dougb/portmaster/portmaster	Mon Oct 31 02:43:36 2011	(r226955)
@@ -2291,8 +2291,9 @@ update_port () {
 		unset NO_DEP_UPDATES
 
 	if [ -z "$NO_ACTION" -o -n "$PM_FIRST_PASS" ]; then
-		($0 $ARGS $1) || fail "Update for $1 failed"
+		($0 $ARGS $1) || update_failed=update_failed
 		. $IPC_SAVE
+		[ -n "$update_failed" ] && fail "Update for $1 failed"
 	else
 		pm_v "===>>> Build canceled due to -n flag"
 	fi
@@ -2780,8 +2781,9 @@ multiport () {
 
 		numports=$(( $numports + 1 ))
 		init_term_printf "$port ${numports}/${numports}"
-		($0 $ARGS $port) || fail "Update for $port failed"
+		($0 $ARGS $port) || update_failed=update_failed
 		. $IPC_SAVE
+		[ -n "$update_failed" ] && fail "Update for $port failed"
 
 		case "$PM_NEEDS_UPDATE" in
 		*\ $origin\ *)	continue ;;	# Handle +IGNOREME in child
@@ -2821,8 +2823,9 @@ multiport () {
 
 		num=$(( $num + 1 ))
 		init_term_printf "$port ${num}/${numports}"
-		($0 $ARGS $port) || fail "Update for $port failed"
+		($0 $ARGS $port) || update_failed=update_failed
 		. $IPC_SAVE
+		[ -n "$update_failed" ] && fail "Update for $port failed"
 	done
 
 	if [ -n "$PM_URB" ]; then