Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pkg_install-20201205

This commit is contained in:
wiz 2020-12-05 16:21:26 +00:00
parent b5df368a51
commit f5c2953af3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
external/bsd/pkg_install/dist/lib/pkgdb.c vendored
View File

@ -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;

4
external/bsd/pkg_install/dist/lib/version.h vendored
View File

@ -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_ */