From owner-svn-src-all@FreeBSD.ORG  Fri Jul  5 01:32:39 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C5E01633;
 Fri,  5 Jul 2013 01:32:39 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B80BB18D6;
 Fri,  5 Jul 2013 01:32:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r651Wdus027159;
 Fri, 5 Jul 2013 01:32:39 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r651WdSr027158;
 Fri, 5 Jul 2013 01:32:39 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201307050132.r651WdSr027158@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Fri, 5 Jul 2013 01:32:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252742 - head/usr.sbin/bsdconfig/share/packages
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 01:32:39 -0000

Author: dteske
Date: Fri Jul  5 01:32:39 2013
New Revision: 252742
URL: http://svnweb.freebsd.org/changeset/base/252742

Log:
  Remove separate processing of dependent packages from the "Review" screen
  since f_package_add (packageAdd resword) processes dependencies itself.
  NOTE: This is in preparation for incoming package management code.

Modified:
  head/usr.sbin/bsdconfig/share/packages/packages.subr

Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/packages/packages.subr	Fri Jul  5 01:30:13 2013	(r252741)
+++ head/usr.sbin/bsdconfig/share/packages/packages.subr	Fri Jul  5 01:32:39 2013	(r252742)
@@ -620,23 +620,14 @@ f_package_review()
 
 	#
 	# Process each of the selected packages:
-	# + First, process dependencies.
-	# + Second, process packages marked for Install.
-	# + Third, process packages marked for Re-install.
+	# + First, process packages marked for Install.
+	# + Second, process packages marked for Re-install.
 	# + Finally, process packages marked for Uninstall.
 	#
 	for package in $SELECTED_PACKAGES; do
 		mark=
 		f_str2varname "$package" varpkg
 		f_getvar _mark_$varpkg mark
-		[ "$mark" = "D" ] || continue
-		# XXX Install dependency
-		f_package_deselect "$package"
-	done
-	for package in $SELECTED_PACKAGES; do
-		mark=
-		f_str2varname "$package" varpkg
-		f_getvar _mark_$varpkg mark
 		[ "$mark" = "I" ] || continue
 		# XXX Install package
 		f_package_deselect "$package"