pkg_install: Update to 20211021.

Apply patch from Michal Maruska in #95 to ensure package files are correctly cleaned up should the POST-INSTALL script phase fail.
NetBSD · Oct 21, 2021 · 56301d5 · 56301d5
1 parent 1eee2d9
commit 56301d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: perform.c,v 1.120 2021/04/10 20:10:48 nia Exp $	*/
+/*	$NetBSD: perform.c,v 1.121 2021/10/21 13:05:25 jperkin Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.120 2021/04/10 20:10:48 nia Exp $");
+__RCSID("$NetBSD: perform.c,v 1.121 2021/10/21 13:05:25 jperkin Exp $");
 
 /*-
  * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
@@ -1545,7 +1545,7 @@ pkg_do(const char *pkgpath, int mark_automatic, int top_level)
 		goto nuke_pkg;
 
 	if (run_install_script(pkg, "POST-INSTALL"))
-		goto nuke_pkgdb;
+		goto nuke_pkg;
 
 	/* XXX keep +INSTALL_INFO for updates? */
 	/* XXX keep +PRESERVE for updates? */

diff --git 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.187 2021/04/10 11:36:56 nia Exp $	*/
+/*	$NetBSD: version.h,v 1.188 2021/10/21 13:05:25 jperkin 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 20210410
+#define PKGTOOLS_VERSION 20211021
 
 #endif /* _INST_LIB_VERSION_H_ */