From owner-svn-src-user@FreeBSD.ORG  Tue Sep  6 03:17:11 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 74474106566C;
	Tue,  6 Sep 2011 03:17:11 +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 64E368FC08;
	Tue,  6 Sep 2011 03:17:11 +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 p863HB3Y065882;
	Tue, 6 Sep 2011 03:17:11 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p863HB1e065880;
	Tue, 6 Sep 2011 03:17:11 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201109060317.p863HB1e065880@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 6 Sep 2011 03:17:11 +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: r225412 - 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: Tue, 06 Sep 2011 03:17:11 -0000

Author: dougb
Date: Tue Sep  6 03:17:11 2011
New Revision: 225412
URL: http://svn.freebsd.org/changeset/base/225412

Log:
  The -a option needs the same check as -r

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Tue Sep  6 02:31:57 2011	(r225411)
+++ user/dougb/portmaster/portmaster	Tue Sep  6 03:17:11 2011	(r225412)
@@ -748,7 +748,8 @@ unset -f packages_init cross_idx test_co
 # Update based on options chosen above
 if [ "$$" -eq "$PM_PARENT_PID" ]; then
 	# Continue error checking in parent only
-	[ -n "$PM_URB" -a -n "$1" ] && fail 'The -r option is not compatible with other updates'
+	[ -n "$PM_URB" -o -n "$UPDATE_ALL" ] && [ -n "$1" ] &&
+	    fail 'The -[ar] options are not compatible with other updates'
 
 	if [ -n "$PM_PACKAGES" -o -n "$PM_PACKAGES_BUILD" ]; then
 		[ `/sbin/sysctl -n kern.osreldate 2>/dev/null` -lt 600400 ] &&