CVS commit: pkgsrc/pkgtools/pkg_install/files

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Oct 21 13:05:25 UTC 2021

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

Log Message:
pkg_install: Update to 20211021.

Apply patch from Michal Maruska in NetBSD/pkgsrc#95 to ensure package files
are correctly cleaned up should the POST-INSTALL script phase fail.


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 pkgsrc/pkgtools/pkg_install/files/add/perform.c
cvs rdiff -u -r1.187 -r1.188 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.120 pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.121
--- pkgsrc/pkgtools/pkg_install/files/add/perform.c:1.120       Sat Apr 10 20:10:48 2021
+++ pkgsrc/pkgtools/pkg_install/files/add/perform.c     Thu Oct 21 13:05:25 2021
@@ -1,4 +1,4 @@
-/*     $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
@@ -6,7 +6,7 @@
 #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@localhost>
@@ -1545,7 +1545,7 @@ pkg_do(const char *pkgpath, int mark_aut
                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? */

Index: pkgsrc/pkgtools/pkg_install/files/lib/version.h
diff -u pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.187 pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.188
--- pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.187       Sat Apr 10 11:36:56 2021
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h     Thu Oct 21 13:05:25 2021
@@ -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_ */