From owner-svn-src-user@FreeBSD.ORG  Sat Dec  5 08:41:09 2009
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 3F3C91065670;
	Sat,  5 Dec 2009 08:41:09 +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 155D68FC14;
	Sat,  5 Dec 2009 08:41:09 +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 nB58f8Hj079171;
	Sat, 5 Dec 2009 08:41:08 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB58f8AW079169;
	Sat, 5 Dec 2009 08:41:08 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200912050841.nB58f8AW079169@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 5 Dec 2009 08:41:08 +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: r200114 - 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, 05 Dec 2009 08:41:09 -0000

Author: dougb
Date: Sat Dec  5 08:41:08 2009
New Revision: 200114
URL: http://svn.freebsd.org/changeset/base/200114

Log:
  If we are using --packages{-only|-newer} then don't run build
  dependencies unless we are actually going to build the port.
  
  When doing the second-chance attempt at fetching a package
  directly (after the reading of the directory listing does
  not show anything useful) print a more helpful message if -v.
  
  No need to print stderr if the package fetch fails.
  
  Make the "checking package repository" message more clear/verbose

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sat Dec  5 08:32:12 2009	(r200113)
+++ user/dougb/portmaster/portmaster	Sat Dec  5 08:41:08 2009	(r200114)
@@ -2383,7 +2383,7 @@ fi
 
 if [ -z "$NO_DEP_UPDATES" ]; then
 	if [ -z "$RECURSE_THOROUGH" ]; then
-		if [ ! "$PM_PACKAGES" = only ]; then
+		if [ -z "$PM_PACKAGES" ]; then
 			echo "===>>> Starting check for build dependencies"
 			dependency_check build-depends-list
 		fi
@@ -2437,11 +2437,17 @@ fetch_package () {
 	fi
 
 	if [ -n "$do_fetch" ]; then
-		[ -n "$PM_VERBOSE" ] && echo "===>>> Starting package fetch"
+		if [ -n "$PM_VERBOSE" ]; then
+			if [ -n "$2" ]; then
+				echo "===>>> Trying to fetch $1 directly"
+			else
+				echo "===>>> Starting package fetch"
+			fi
+		fi
 
 		fetch $fetch_args -o $ppd ${sitepath}${1}.tbz 2>/dev/null || {
 			pm_unlink ${ppd}/${1}.tbz;
-			fetch $fetch_args -o $ppd ${sitepath}${1}.tbz; }
+			fetch $fetch_args -o $ppd ${sitepath}${1}.tbz 2>/dev/null; }
 	fi
 }
 	if [ -z "$PACKAGESITE" ]; then
@@ -2469,7 +2475,8 @@ fetch_package () {
 
 	sitepath="${sitepath%/}/${portdir%/*}/"
 
-	[ -n "$PM_VERBOSE" ] && echo "===>>> Checking package repository"
+	[ -n "$PM_VERBOSE" ] &&
+		echo "===>>> Checking package repository for latest available version"
 
 	case "$new_port" in
 	*\.*)	s=${new_port%%\.*} ;;
@@ -2479,7 +2486,7 @@ fetch_package () {
 	unset s
 
 	if [ -z "$latest_pv" ]; then
-		fetch_package $new_port
+		fetch_package $new_port try
 		if [ $? -eq 0 ]; then
 			latest_pv=$new_port
 		fi
@@ -2537,7 +2544,7 @@ notnewer () {
 			echo "       is newer than ports tree ($new_port)"; } ;;
 		=)	;;	# Should not be reached
 		*)	# Packages like autoconf-2.1* vs. 2.6* can be false neg.
-			fetch_package $new_port
+			fetch_package $new_port try
 			if [ $? -eq 0 ]; then
 				latest_pv=$new_port
 				use_package=up_auto
@@ -2571,6 +2578,13 @@ echo "===>>> There is no valid package t
 fi
 
 if [ -z "$use_package" ]; then
+	if [ -n "$PM_PACKAGES" ]; then
+		if [ -z "$RECURSE_THOROUGH" ]; then
+			echo "===>>> Starting check for build dependencies"
+			dependency_check build-depends-list
+		fi
+	fi
+
 	[ -z "$DONT_PRE_CLEAN" ] && { pm_make clean NOCLEANDEPENDS=ncd ||
 		fail 'make clean failed'; echo ''; }