From owner-svn-src-stable@FreeBSD.ORG Mon Oct 29 17:41:39 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D9314DCE; Mon, 29 Oct 2012 17:41:39 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx1.freebsd.org (Postfix) with ESMTP id 884DB8FC0C; Mon, 29 Oct 2012 17:41:38 +0000 (UTC) Received: by mail-lb0-f182.google.com with SMTP id b5so4155913lbd.13 for ; Mon, 29 Oct 2012 10:41:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=y26Mq0fLtBfiSfGiYA1iUDFDflfBnx5ngjqqF+Q34zE=; b=B3rp1SpSkYORhB2T3QgIw36cud2G2XjNC4t93UUVb6WRQajpJG63O28WP2/GsK54Wr KOy5OTj6FT+ITV068kxShsei0ObeUjXI9E/qaIg2C4eDvZVGIhD/NX3mCqOojWaePzAU vourhEQMyzJSD9tYweeqDPAAYgfbHFUYLmgO4gxTyrg44FbdkH12Td9XTMuV5tE0ThmJ Amsyz3Xspv2n4iluvoMuSob+FW2BjvmQV9M+HIW02l8TxKtqj2rE2omuVa25cDyD58g5 qPfFCkaGQpIxG5pFeUCsF9Eq9bIF47sWl+Tuzh2oLOgsyiKOc+Uxtv2XJKjTrnyQTjC0 nIlg== MIME-Version: 1.0 Received: by 10.112.45.66 with SMTP id k2mr12116975lbm.89.1351532497396; Mon, 29 Oct 2012 10:41:37 -0700 (PDT) Received: by 10.112.59.41 with HTTP; Mon, 29 Oct 2012 10:41:37 -0700 (PDT) In-Reply-To: <201210291658.q9TGwjQB003043@svn.freebsd.org> References: <201210291658.q9TGwjQB003043@svn.freebsd.org> Date: Mon, 29 Oct 2012 10:41:37 -0700 Message-ID: Subject: Re: svn commit: r242318 - stable/9/etc/defaults From: Garrett Cooper To: Hajimu UMEMOTO Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Oct 2012 17:41:40 -0000 On Mon, Oct 29, 2012 at 9:58 AM, Hajimu UMEMOTO 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