svn commit: r242318 - stable/9/etc/defaults

[Garrett Cooper]

On Mon, Oct 29, 2012 at 9:58 AM, Hajimu UMEMOTO <ume at freebsd.org> wrote:
> Author: ume
> Date: Mon Oct 29 16:58:45 2012
> New Revision: 242318
> URL: http://svn.freebsd.org/changeset/base/242318
>
> Log:
>   MFC r241788: Set default for ${pkg_info} like ${pkg_version}.
>
> Modified:
>   stable/9/etc/defaults/periodic.conf
> Directory Properties:
>   stable/9/etc/   (props changed)
>
> Modified: stable/9/etc/defaults/periodic.conf
> ==============================================================================
> --- stable/9/etc/defaults/periodic.conf Mon Oct 29 16:42:37 2012        (r242317)
> +++ stable/9/etc/defaults/periodic.conf Mon Oct 29 16:58:45 2012        (r242318)
> @@ -143,6 +143,7 @@ daily_status_ntpd_enable="NO"                               # Check
>
>  # 490.status-pkg-changes
>  daily_status_pkg_changes_enable="NO"                   # Show package changes
> +pkg_info="pkg_info"                                    # Use this program

    I meant to comment on this earlier. Wouldn't it be smarter to say..?

# Getting this via make is a chicken and egg problem: how can one
reliably divine ${PKG_DBDIR}
# without knowing where ${PORTSDIR}/Mk is? Just simpler to work with
the default as opposed to
# dealing with all edgecases.
: ${PKG_DBDIR=/var/db/pkg}
if [ -f $PKG_DBDIR/local.sqlite ]
then
    pkg_info="pkg info"
    pkg_version="pkg version"
else
    pkg_info="pkg_info"
    pkg_version="pkg_version"
fi

    The code that you added assumes that someone is not using pkgng,
which isn't terribly useful if someone's running an up-to-date ports
tree.
Thanks,
-Garrett