[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files pkg_install-20090212:

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a1979d002c19
branches:  trunk
changeset: 554307:a1979d002c19
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Feb 11 23:42:42 2009 +0000

description:
pkg_install-20090212:
Print the error about missing build information even when the
+BUILD_INFO file is missing instead of segfaulting. The problem is from
PR 30276, a solution in the form of just installing it will not be
implemented.

diffstat:

 pkgtools/pkg_install/files/add/perform.c |  6 +++---
 pkgtools/pkg_install/files/lib/version.h |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 871ed4322813 -r a1979d002c19 pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Wed Feb 11 23:31:30 2009 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Wed Feb 11 23:42:42 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.75 2009/02/03 19:47:37 joerg Exp $       */
+/*     $NetBSD: perform.c,v 1.76 2009/02/11 23:42:42 joerg Exp $       */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -6,7 +6,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.75 2009/02/03 19:47:37 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.76 2009/02/11 23:42:42 joerg Exp $");
 
 /*-
  * Copyright (c) 2003 Grant Beattie <grant%NetBSD.org@localhost>
@@ -458,7 +458,7 @@
 
        data = pkg->meta_data.meta_build_info;
 
-       for (; *data != '\0'; data = next_line) {
+       for (; data != NULL && *data != '\0'; data = next_line) {
                if ((eol = strchr(data, '\n')) == NULL) {
                        eol = data + strlen(data);
                        next_line = eol;
diff -r 871ed4322813 -r a1979d002c19 pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Wed Feb 11 23:31:30 2009 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Wed Feb 11 23:42:42 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.109 2009/02/05 17:22:19 joerg Exp $      */
+/*     $NetBSD: version.h,v 1.110 2009/02/11 23:42:42 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 "20090205"
+#define PKGTOOLS_VERSION "20090212"
 
 #endif /* _INST_LIB_VERSION_H_ */