From owner-svn-src-user@FreeBSD.ORG  Sat Oct 30 00:00:54 2010
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 9C5341065670;
	Sat, 30 Oct 2010 00:00:54 +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 8BE578FC08;
	Sat, 30 Oct 2010 00:00:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9U00sra067630;
	Sat, 30 Oct 2010 00:00:54 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9U00soa067628;
	Sat, 30 Oct 2010 00:00:54 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201010300000.o9U00soa067628@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 30 Oct 2010 00:00:54 +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: r214541 - 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: Sat, 30 Oct 2010 00:00:54 -0000

Author: dougb
Date: Sat Oct 30 00:00:54 2010
New Revision: 214541
URL: http://svn.freebsd.org/changeset/base/214541

Log:
  In the parent, use the $PM_NEEDS_UPDATE list to suggest a shortcut to
  resume a failed build
  
  In a child process, if we've failed there is no point in updating
  $IPC_SAVE, so just die instead.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Fri Oct 29 23:24:44 2010	(r214540)
+++ user/dougb/portmaster/portmaster	Sat Oct 30 00:00:54 2010	(r214541)
@@ -210,6 +210,13 @@ parent_exit () {
 		done
 		echo ''
 	fi
+
+	if [ -n "$1" ]; then
+		echo ''
+		echo "===>>> You can restart from the point of failure with this command line:"
+		echo "       ${0##*/} <flags> $PM_NEEDS_UPDATE"
+		echo ''
+	fi
 }
 
 safe_exit () {
@@ -218,6 +225,8 @@ safe_exit () {
 	else
 		[ -n "$grep_deps" ] && pm_unlink $grep_deps
 
+		[ -n "$1" ] && exit $1
+
 		# Save state for the parent process to read back in
 		if [ -z "$PM_FIRST_PASS" ]; then
 			> $IPC_SAVE