pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files pkg_install: Update to 2021...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/43ab09450f79
branches:  trunk
changeset: 768396:43ab09450f79
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Oct 21 13:05:25 2021 +0000

description:
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.

diffstat:

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

diffs (44 lines):

diff -r 228ebd0b75a8 -r 43ab09450f79 pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Thu Oct 21 12:18:01 2021 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Thu Oct 21 13:05:25 2021 +0000
@@ -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 @@
                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 -r 228ebd0b75a8 -r 43ab09450f79 pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Thu Oct 21 12:18:01 2021 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Thu Oct 21 13:05:25 2021 +0000
@@ -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_ */



Home | Main Index | Thread Index | Old Index