From f5c2953af301f48c9b6e8bbfd430ed9520a4a992 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 5 Dec 2020 16:21:26 +0000 Subject: [PATCH] Merge pkg_install-20201205 --- external/bsd/pkg_install/dist/lib/pkgdb.c | 9 +++++---- external/bsd/pkg_install/dist/lib/version.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/external/bsd/pkg_install/dist/lib/pkgdb.c b/external/bsd/pkg_install/dist/lib/pkgdb.c index 0ce4129f754d..016b93c3b587 100644 --- a/external/bsd/pkg_install/dist/lib/pkgdb.c +++ b/external/bsd/pkg_install/dist/lib/pkgdb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pkgdb.c,v 1.3 2020/12/02 13:53:50 wiz Exp $ */ +/* $NetBSD: pkgdb.c,v 1.4 2020/12/05 16:21:26 wiz Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -7,7 +7,7 @@ #if HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: pkgdb.c,v 1.3 2020/12/02 13:53:50 wiz Exp $"); +__RCSID("$NetBSD: pkgdb.c,v 1.4 2020/12/05 16:21:26 wiz Exp $"); /*- * Copyright (c) 1999-2010 The NetBSD Foundation, Inc. @@ -310,8 +310,9 @@ pkgdb_get_dir(void) stat("/var/db/pkg", &sb) == 0) { errx(EXIT_FAILURE, "The default PKG_DBDIR has changed, but this installation still uses the old one.\n" - "Please move the database and re-run this command:\n" - "\tmv /var/db/pkg " DEF_LOG_DIR); + "Please move the databases and re-run this command:\n" + "\tmv /var/db/pkg " DEF_LOG_DIR "\n" + "\tmv /var/db/pkg.refcount " DEF_LOG_DIR ".refcount"); } return pkgdb_dir; diff --git a/external/bsd/pkg_install/dist/lib/version.h b/external/bsd/pkg_install/dist/lib/version.h index 0755c41d0977..df8718c81593 100644 --- a/external/bsd/pkg_install/dist/lib/version.h +++ b/external/bsd/pkg_install/dist/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.16 2020/12/02 13:53:50 wiz Exp $ */ +/* $NetBSD: version.h,v 1.17 2020/12/05 16:21:26 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 20200828 +#define PKGTOOLS_VERSION 20201205 #endif /* _INST_LIB_VERSION_H_ */