CVS commit: pkgsrc/pkgtools/pkg_install/files/lib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Dec  5 16:17:41 UTC 2020

Modified Files:
        pkgsrc/pkgtools/pkg_install/files/lib: pkgdb.c version.h

Log Message:
pkg_install: update to 20201205

Improve warning about old database to mention moving the refcount db too.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/pkgtools/pkg_install/files/lib/pkgdb.c
cvs rdiff -u -r1.180 -r1.181 pkgsrc/pkgtools/pkg_install/files/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: pkgsrc/pkgtools/pkg_install/files/lib/pkgdb.c
diff -u pkgsrc/pkgtools/pkg_install/files/lib/pkgdb.c:1.40 pkgsrc/pkgtools/pkg_install/files/lib/pkgdb.c:1.41
--- pkgsrc/pkgtools/pkg_install/files/lib/pkgdb.c:1.40  Wed Dec  2 10:22:39 2020
+++ pkgsrc/pkgtools/pkg_install/files/lib/pkgdb.c       Sat Dec  5 16:17:41 2020
@@ -1,4 +1,4 @@
-/*     $NetBSD: pkgdb.c,v 1.40 2020/12/02 10:22:39 wiz Exp $   */
+/*     $NetBSD: pkgdb.c,v 1.41 2020/12/05 16:17:41 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.40 2020/12/02 10:22:39 wiz Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.41 2020/12/05 16:17:41 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: pkgsrc/pkgtools/pkg_install/files/lib/version.h
diff -u pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.180 pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.181
--- pkgsrc/pkgtools/pkg_install/files/lib/version.h:1.180       Wed Dec  2 10:22:39 2020
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h     Sat Dec  5 16:17:41 2020
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.180 2020/12/02 10:22:39 wiz Exp $        */
+/*     $NetBSD: version.h,v 1.181 2020/12/05 16:17:41 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_ */