CVS commit: pkgsrc/pkgtools/pkg_install/files

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Dec  6 17:23:09 UTC 2020

Modified Files:
        pkgsrc/pkgtools/pkg_install/files/add: perform.c
        pkgsrc/pkgtools/pkg_install/files/lib: version.h

Log Message:
pkg_install: update to 20201206

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


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 pkgsrc/pkgtools/pkg_install/files/add/perform.c
cvs rdiff -u -r1.181 -r1.182 pkgsrc/pkgtools/pkg_install/files/lib/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkg_install/files/add/perform.c
diff -u pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.113 pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.114
--- pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.113       Fri Oct  9 07:37:20 2020
+++ pkgsrc/pkgtools/pkg_install/files/add/perform.c     Sun Dec  6 17:23:09 2020
@@ -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 @@ 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)

Index: pkgsrc/pkgtools/pkg_install/files/lib/version.h
diff -u pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.181 pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.182
--- pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.181       Sat Dec  5 16:17:41 2020
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h     Sun Dec  6 17:23:09 2020
@@ -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_ */