From owner-svn-src-user@FreeBSD.ORG  Mon May 17 02:44:52 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 3BDCA106566B;
	Mon, 17 May 2010 02:44:52 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2BF938FC12;
	Mon, 17 May 2010 02:44:52 +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 o4H2ip1g091381;
	Mon, 17 May 2010 02:44:51 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4H2ipiN091379;
	Mon, 17 May 2010 02:44:51 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201005170244.o4H2ipiN091379@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 17 May 2010 02:44:51 +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: r208182 - 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, 17 May 2010 02:44:52 -0000

Author: dougb
Date: Mon May 17 02:44:51 2010
New Revision: 208182
URL: http://svn.freebsd.org/changeset/base/208182

Log:
  In iport_from_origin() if we don't find a match (which is normal for
  ports that are not yet installed) then return immediately.
  
  In check_for_updates() if a port has moved we should also check for
  an +IGNOREME file before forcing the update.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon May 17 02:20:24 2010	(r208181)
+++ user/dougb/portmaster/portmaster	Mon May 17 02:44:51 2010	(r208182)
@@ -601,7 +601,7 @@ unset var newopts
 
 iport_from_origin () {
 	local dir
-	dir=`grep -l "@comment ORIGIN:${1}$" $pdb/*/+CONTENTS`
+	dir=`grep -l "@comment ORIGIN:${1}$" $pdb/*/+CONTENTS` || return 1
 
 	# It should not happen that more than one port meets this
 	# requirement, but it can if the pkg data is corrupted.
@@ -1285,8 +1285,17 @@ check_for_updates () {
 	elif [ -z "$do_update" -a -z "$skip" ]; then
 		find_moved_port $origin $iport $nf
 
-		# If the port has moved, we have to update it, otherwise ignore
-		[ -n "$moved_npd" ] && do_update=do_update6
+		# If the port has moved and no +IGNOREME, we have to update it
+		if [ -n "$moved_npd" ]; then
+			if [ ! -e "$pdb/$iport/+IGNOREME" ]; then
+				do_update=do_update_moved
+			else
+				echo "	===>>> Continuing due to $pdb/$iport/+IGNOREME"
+				echo ''
+				CUR_DEPS="${CUR_DEPS}${iport}:${origin}:"
+				return 0
+			fi
+		fi
 	fi
 
 	if [ -z "$do_update" -a -n "$port_ver" ]; then