From b325bf60b5c4447774d91283ad98be265d1d653e Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 22 Nov 2010 09:00:12 +0000 Subject: pkg_install-20101122: Fix crash in pkg_info -X on hand-written packages --- pkgtools/pkg_install/files/info/show.c | 7 ++++--- pkgtools/pkg_install/files/lib/version.h | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgtools') diff --git a/pkgtools/pkg_install/files/info/show.c b/pkgtools/pkg_install/files/info/show.c index c7cb172eb2f..d491f76bdfc 100644 --- a/pkgtools/pkg_install/files/info/show.c +++ b/pkgtools/pkg_install/files/info/show.c @@ -1,4 +1,4 @@ -/* $NetBSD: show.c,v 1.30 2009/08/02 17:56:45 joerg Exp $ */ +/* $NetBSD: show.c,v 1.31 2010/11/22 09:00:12 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: show.c,v 1.30 2009/08/02 17:56:45 joerg Exp $"); +__RCSID("$NetBSD: show.c,v 1.31 2010/11/22 09:00:12 joerg Exp $"); /* * FreeBSD install - a package for the installation and maintainance @@ -360,7 +360,8 @@ show_summary(struct pkg_meta *meta, package_t *plist, const char *binpkgfile) } print_string_as_var("COMMENT", meta->meta_comment); - print_string_as_var("SIZE_PKG", meta->meta_size_pkg); + if (meta->meta_size_pkg) + print_string_as_var("SIZE_PKG", meta->meta_size_pkg); if (meta->meta_build_info) var_copy_list(meta->meta_build_info, bi_vars); diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index b2d49567627..2053692c4b7 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.158 2010/09/15 13:18:02 joerg Exp $ */ +/* $NetBSD: version.h,v 1.159 2010/11/22 09:00:13 joerg Exp $ */ /* * Copyright (c) 2001 Thomas Klausner. All rights reserved. @@ -27,6 +27,6 @@ #ifndef _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_ -#define PKGTOOLS_VERSION 20100915 +#define PKGTOOLS_VERSION 20101122 #endif /* _INST_LIB_VERSION_H_ */ -- cgit v1.2.3