From 7b1053a0cd3abb506cc9b6086918fb299ef7c28d Mon Sep 17 00:00:00 2001 From: dteske Date: Fri, 5 Jul 2013 01:32:39 +0000 Subject: 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. --- usr.sbin/bsdconfig/share/packages/packages.subr | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/usr.sbin/bsdconfig/share/packages/packages.subr b/usr.sbin/bsdconfig/share/packages/packages.subr index de31dfb..a5603c4 100755 --- a/usr.sbin/bsdconfig/share/packages/packages.subr +++ b/usr.sbin/bsdconfig/share/packages/packages.subr @@ -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" -- cgit v1.1