[src/pkgviews]: src/usr.sbin/pkg_install/add Ensure that pkg_delete is called...

[jlam <jlam%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d7d560baf2c7
branches:  pkgviews
changeset: 534274:d7d560baf2c7
user:      jlam <jlam%NetBSD.org@localhost>
date:      Wed Aug 27 00:28:16 2003 +0000

description:
Ensure that pkg_delete is called with the same package database directory
as pkg_add.

diffstat:

 usr.sbin/pkg_install/add/perform.c |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 0a9ae9fc3b7c -r d7d560baf2c7 usr.sbin/pkg_install/add/perform.c
--- a/usr.sbin/pkg_install/add/perform.c        Tue Aug 26 22:32:12 2003 +0000
+++ b/usr.sbin/pkg_install/add/perform.c        Wed Aug 27 00:28:16 2003 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.70.2.8 2003/08/26 22:32:12 jlam Exp $    */
+/*     $NetBSD: perform.c,v 1.70.2.9 2003/08/27 00:28:16 jlam Exp $    */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.70.2.8 2003/08/26 22:32:12 jlam Exp $");
+__RCSID("$NetBSD: perform.c,v 1.70.2.9 2003/08/27 00:28:16 jlam Exp $");
 #endif
 #endif
 
@@ -432,9 +432,16 @@
                                                replacing = 1;
                                        }
 
-                                       if (Verbose)
-                                               printf("pkg_delete '%s'\n", installed);
-                                       vsystem("%s/pkg_delete '%s'\n", BINDIR, installed);
+                                       if (Verbose) {
+                                               printf("%s/pkg_delete -K %s '%s'\n",
+                                                       BINDIR,
+                                                       dbdir,
+                                                       installed);
+                                       }
+                                       vsystem("%s/pkg_delete -K %s '%s'\n",
+                                               BINDIR,
+                                               dbdir,
+                                               installed);
 
                                } else {
                                        warnx("other version '%s' already installed", installed);