[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files pkg_install: update to 2020...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/85bc8f45d31e
branches:  trunk
changeset: 443082:85bc8f45d31e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Dec 06 17:23:09 2020 +0000

description:
pkg_install: update to 20201206

Convert a core dump I've been seeing into an error abort.

diffstat:

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

diffs (46 lines):

diff -r df48a769cd00 -r 85bc8f45d31e pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Sun Dec 06 16:46:28 2020 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Sun Dec 06 17:23:09 2020 +0000
@@ -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@localhost>
@@ -1179,6 +1179,10 @@
                        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 -r df48a769cd00 -r 85bc8f45d31e pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Sun Dec 06 16:46:28 2020 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Sun Dec 06 17:23:09 2020 +0000
@@ -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_ */