Module Name: src
Committed By: wiz
Date: Sat Dec 5 16:21:26 UTC 2020
Modified Files:
src/external/bsd/pkg_install/dist/lib: pkgdb.c version.h
Log Message:
Merge pkg_install-20201205
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/pkgdb.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/pkg_install/dist/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: src/external/bsd/pkg_install/dist/lib/pkgdb.c
diff -u src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.3 src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.4
--- src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.3 Wed Dec 2 13:53:50 2020
+++ src/external/bsd/pkg_install/dist/lib/pkgdb.c Sat Dec 5 16:21:26 2020
@@ -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 <sys/cdefs.h>
#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;
Index: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.16 src/external/bsd/pkg_install/dist/lib/version.h:1.17
--- src/external/bsd/pkg_install/dist/lib/version.h:1.16 Wed Dec 2 13:53:50 2020
+++ src/external/bsd/pkg_install/dist/lib/version.h Sat Dec 5 16:21:26 2020
@@ -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_ */
