diff options
| author | wiz <wiz@pkgsrc.org> | 2020-12-06 17:23:09 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2020-12-06 17:23:09 +0000 |
| commit | d073d5f620610cde84e79097101ec04fafac0bc9 (patch) | |
| tree | f20ec0562a6e2224dcace8a39b2bb7a0ec5060b5 /pkgtools/pkg_install | |
| parent | 2028b39898f151c165cc74e2052dd0021643988d (diff) | |
| download | pkgsrc-d073d5f620610cde84e79097101ec04fafac0bc9.tar.gz | |
pkg_install: update to 20201206
Convert a core dump I've been seeing into an error abort.
Diffstat (limited to 'pkgtools/pkg_install')
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 8 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 8 insertions, 4 deletions
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 <sys/cdefs.h> #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 <grant@NetBSD.org> @@ -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_ */ |