From 43f048448830a44cdd3b3399e3963bca0e0f123e Mon Sep 17 00:00:00 2001
From: jschauma <jschauma@pkgsrc.org>
Date: Sat, 29 Mar 2003 18:41:56 +0000
Subject: Synch with main sources:

Changes by hubertf and seb; these changes tested on NetBSD, Linux and Irix.

Modified Files:
	src/usr.sbin/pkg_install/add: perform.c pkg_add.1

Log Message:
Implement remaining TODO item in pkg upgrade (pkg_add -u):
* Upgrade step 1/4: Check if the new version is ok with all pkgs
* (from +REQUIRED_BY) that require this pkg

Inspired by bsd.pkg.mk's upgrade(?) target.

Modified Files:
	src/usr.sbin/pkg_install/admin: main.c
	src/usr.sbin/pkg_install/info: main.c perform.c

Log Message:
Consistently check findmatchingname() return value for error condition.
Among other this fixes 'pkg_info -e whateverpkg' exit status when
/var/db/pkg is missing: it is now 1 and not 0.

Modified Files:
	src/usr.sbin/pkg_install/lib: version.h

Log Message:
Bump to "20030325" after today's changes from seb and me
---
 pkgtools/pkg_install/files/lib/pkgdb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgtools/pkg_install/files/lib/pkgdb.c')

diff --git a/pkgtools/pkg_install/files/lib/pkgdb.c b/pkgtools/pkg_install/files/lib/pkgdb.c
index 402aeaf84ec..907a2db3605 100644
--- a/pkgtools/pkg_install/files/lib/pkgdb.c
+++ b/pkgtools/pkg_install/files/lib/pkgdb.c
@@ -1,9 +1,9 @@
-/*	$NetBSD: pkgdb.c,v 1.8 2003/03/16 19:44:10 jschauma Exp $	*/
+/*	$NetBSD: pkgdb.c,v 1.9 2003/03/29 18:41:57 jschauma Exp $	*/
 
 #if 0
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: pkgdb.c,v 1.8 2003/03/16 19:44:10 jschauma Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.9 2003/03/29 18:41:57 jschauma Exp $");
 #endif
 #endif
 
@@ -183,6 +183,7 @@ pkgdb_retrieve(const char *key)
 void
 pkgdb_dump(void)
 {
+#if defined(HAVE_DBOPEN)
 	DBT     key;
 	DBT     val;
 	int     type;
@@ -195,6 +196,7 @@ pkgdb_dump(void)
 		}
 		pkgdb_close();
 	}
+#endif
 }
 
 /*
-- 
cgit v1.2.3