diff options
| author | jperkin <jperkin@pkgsrc.org> | 2021-10-21 13:05:25 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2021-10-21 13:05:25 +0000 |
| commit | 56301d5ca2d45b52f85960f74f9bfaddfaef5688 (patch) | |
| tree | 4d84832a2de30da1f9f4f1e34fa6eeb2fb5fda85 /pkgtools | |
| parent | 1eee2d9dbb38ccd77d261a050372260b5478eca1 (diff) | |
| download | pkgsrc-56301d5ca2d45b52f85960f74f9bfaddfaef5688.tar.gz | |
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 (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index 2a1d99941df..65e20c55426 100644 --- a/pkgtools/pkg_install/files/add/perform.c +++ b/pkgtools/pkg_install/files/add/perform.c @@ -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> @@ -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 index 9df41dfeb33..574922c89db 100644 --- 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_ */ |