From owner-svn-src-user@FreeBSD.ORG  Mon Jun 11 04:11:46 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E8472106566C;
	Mon, 11 Jun 2012 04:11:46 +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 D35CC8FC08;
	Mon, 11 Jun 2012 04:11:46 +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 q5B4Bkub041269;
	Mon, 11 Jun 2012 04:11:46 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5B4BkwB041267;
	Mon, 11 Jun 2012 04:11:46 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201206110411.q5B4BkwB041267@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 11 Jun 2012 04:11:46 +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: r236868 - 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 04:11:47 -0000

Author: dougb
Date: Mon Jun 11 04:11:46 2012
New Revision: 236868
URL: http://svn.freebsd.org/changeset/base/236868

Log:
  In iport_from_origin() work around pkg_info returning 0 even if there is
  no match
  
  In clean_build_only_list() remove ports that are already installed to
  prevent them from being spuriously removed. [1]
  
  Reported by:	avilla [1]

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Jun 11 03:10:15 2012	(r236867)
+++ user/dougb/portmaster/portmaster	Mon Jun 11 04:11:46 2012	(r236868)
@@ -897,7 +897,7 @@ iport_from_origin () {
 
 	if ! dir=`grep -l "@comment ORIGIN:${1}$" $pdb/${sn}*/+CONTENTS 2>/dev/null`; then
 		if ! dir=`grep -l "@comment ORIGIN:${1}$" $pdb/*/+CONTENTS 2>/dev/null`; then
-			dir=`pkg_info -q -O $1` || return 1
+			dir=`pkg_info -q -O $1` ; [ -n "$dir" ] || return 1
 		fi
 	fi
 
@@ -2351,6 +2351,15 @@ clean_build_only_list () {
 	done
 
 	build_only_dl_g=" `uniquify_list $temp_bodlg` "
+	unset temp_bodlg
+
+	# We do not want already installed ports to end up on this list
+	for dep in $build_only_dl_g; do
+		iport_from_origin ${dep#$pd/} >/dev/null && continue
+		temp_bodlg="$temp_bodlg $dep"
+	done
+
+	build_only_dl_g="$temp_bodlg "
 }
 
 gen_dep_list () {