From owner-svn-src-all@FreeBSD.ORG Fri Jul 5 21:40:32 2013 Return-Path: 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 C137FF0C; Fri, 5 Jul 2013 21:40:32 +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 9953A166F; Fri, 5 Jul 2013 21:40:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65LeWRj092372; Fri, 5 Jul 2013 21:40:32 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65LeWGK092370; Fri, 5 Jul 2013 21:40:32 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201307052140.r65LeWGK092370@svn.freebsd.org> From: Devin Teske Date: Fri, 5 Jul 2013 21:40:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r252844 - in 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jul 2013 21:40:32 -0000 Author: dteske Date: Fri Jul 5 21:40:31 2013 New Revision: 252844 URL: http://svnweb.freebsd.org/changeset/base/252844 Log: Add the necessary code to reinstall packages. Both scripted access (packageReinstall) and UI access have been tested successfully with a variation of different situations including: + Reinstall a package for which no other packages depend + Purposefully do thinks like reinstall a package that is not installed + Try to reinstall a package which other installed packages still depend NOTE: There is no "force" used; if a package is required by other packages, it will not be uninstalled (and therefore no reinstall is done). Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr head/usr.sbin/bsdconfig/share/script.subr Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/packages/packages.subr Fri Jul 5 21:33:32 2013 (r252843) +++ head/usr.sbin/bsdconfig/share/packages/packages.subr Fri Jul 5 21:40:31 2013 (r252844) @@ -648,7 +648,7 @@ f_package_review() debug= f_getvar _mark_$varpkg mark [ "$mark" = "R" ] || continue f_dprintf "%s: Reinstalling %s package" $fname "$package" - # XXX Re-install package + f_package_reinstall "$package" done for package in $SELECTED_PACKAGES; do mark= @@ -1186,6 +1186,15 @@ f_package_delete() fi } +# f_package_reinstall $name +# +# A simple wrapper to f_package_delete() + f_package_add() +# +f_package_reinstall() +{ + f_package_delete "$1" && f_package_add "$1" +} + ############################################################ MAIN f_dprintf "%s: Successfully loaded." packages/packages.subr Modified: head/usr.sbin/bsdconfig/share/script.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/script.subr Fri Jul 5 21:33:32 2013 (r252843) +++ head/usr.sbin/bsdconfig/share/script.subr Fri Jul 5 21:40:31 2013 (r252844) @@ -196,6 +196,7 @@ f_resword_new configPCNFSD f_config_pcnf f_resword_new configPackages f_package_config f_resword_new packageAdd f_package_add f_resword_new packageDelete f_package_delete +f_resword_new packageReinstall f_package_reinstall # variable.subr f_resword_new installVarDefaults f_variable_set_defaults