[src/netbsd-3]: src/usr.sbin/pkg_install/info Pull up following revision(s) (...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/85338bee8f17
branches:  netbsd-3
changeset: 577511:85338bee8f17
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Nov 21 20:11:12 2005 +0000

description:
Pull up following revision(s) (requested by dillo in ticket #963):
        usr.sbin/pkg_install/info/perform.c: revision 1.66
Fix first part of PR 32068: pkg_info -Q broken for local binary packages
        Add BUILD_INFO_FNAME to the files to extract for SHOW_BI_VAR.

diffstat:

 usr.sbin/pkg_install/info/perform.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r c08d83fc26c7 -r 85338bee8f17 usr.sbin/pkg_install/info/perform.c
--- a/usr.sbin/pkg_install/info/perform.c       Mon Nov 21 20:10:34 2005 +0000
+++ b/usr.sbin/pkg_install/info/perform.c       Mon Nov 21 20:11:12 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.62.2.3 2005/11/08 18:18:55 jmc Exp $     */
+/*     $NetBSD: perform.c,v 1.62.2.4 2005/11/21 20:11:12 tron Exp $    */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.23 1997/10/13 15:03:53 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.62.2.3 2005/11/08 18:18:55 jmc Exp $");
+__RCSID("$NetBSD: perform.c,v 1.62.2.4 2005/11/21 20:11:12 tron Exp $");
 #endif
 #endif
 
@@ -122,7 +122,7 @@
                                strcat(flist, DESC_FNAME); strcat(flist, " ");
                                if (Flags & SHOW_MTREE)         { strcat(flist, MTREE_FNAME);           strcat(flist, " "); }
                                if (Flags & SHOW_BUILD_VERSION) { strcat(flist, BUILD_VERSION_FNAME);   strcat(flist, " "); }
-                               if (Flags & SHOW_BUILD_INFO)    {
+                               if (Flags & (SHOW_BUILD_INFO|SHOW_BI_VAR)) {
                                        strcat(flist, BUILD_INFO_FNAME);
                                        strcat(flist, " ");
                                }