diff options
| author | joerg <joerg@pkgsrc.org> | 2009-02-11 23:42:42 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-02-11 23:42:42 +0000 |
| commit | 52e03c25de476e657ebbbd1e565e22ec1f07cca7 (patch) | |
| tree | 231a094f370f8a25c68026ea44fa1ce43b40d824 | |
| parent | 4c7b4881063f2417790e4929185c1f8730e819c5 (diff) | |
| download | pkgsrc-52e03c25de476e657ebbbd1e565e22ec1f07cca7.tar.gz | |
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.
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index e1adba5b3e5..a7bc936a149 100644 --- a/pkgtools/pkg_install/files/add/perform.c +++ b/pkgtools/pkg_install/files/add/perform.c @@ -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> @@ -458,7 +458,7 @@ read_buildinfo(struct pkg_task *pkg) 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 --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index c74c3afd75d..27be18a3aa2 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.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_ */ |