From d073d5f620610cde84e79097101ec04fafac0bc9 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 6 Dec 2020 17:23:09 +0000 Subject: pkg_install: update to 20201206 Convert a core dump I've been seeing into an error abort. --- pkgtools/pkg_install/files/add/perform.c | 8 ++++++-- pkgtools/pkg_install/files/lib/version.h | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'pkgtools/pkg_install') diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index 877fcb04967..e78e6190ac5 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.113 2020/10/09 07:37:20 mcf Exp $ */ +/* $NetBSD: perform.c,v 1.114 2020/12/06 17:23:09 wiz Exp $ */ #if HAVE_CONFIG_H #include "config.h" #endif @@ -6,7 +6,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: perform.c,v 1.113 2020/10/09 07:37:20 mcf Exp $"); +__RCSID("$NetBSD: perform.c,v 1.114 2020/12/06 17:23:09 wiz Exp $"); /*- * Copyright (c) 2003 Grant Beattie @@ -1179,6 +1179,10 @@ check_dependencies(struct pkg_task *pkg) continue; best_installed = find_best_matching_installed_pkg(p->name, 0); + if (best_installed == NULL) { + warnx("Expected dependency %s still missing", p->name); + return -1; + } for (i = 0; i < pkg->dep_length; ++i) { if (strcmp(best_installed, pkg->dependencies[i]) == 0) diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index ff01272a8f3..18350c5be60 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.181 2020/12/05 16:17:41 wiz Exp $ */ +/* $NetBSD: version.h,v 1.182 2020/12/06 17:23:09 wiz 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 20201205 +#define PKGTOOLS_VERSION 20201206 #endif /* _INST_LIB_VERSION_H_ */ -- cgit v1.2.3