[src/netbsd-1-6]: src/usr.sbin/pkg_install/add Pull up revision 1.72 (request...

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

details:   https://anonhg.NetBSD.org/src/rev/6d61c0fc7213
branches:  netbsd-1-6
changeset: 529502:6d61c0fc7213
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Nov 24 22:22:42 2002 +0000

description:
Pull up revision 1.72 (requested by jschauma in ticket #1011):
Introduce path_prepend_from_pkgname() and path_remove_first() and
use in pkg_add to ensure the location of the package being added is
checked first for any additional packages.

diffstat:

 usr.sbin/pkg_install/add/perform.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r b683924fa493 -r 6d61c0fc7213 usr.sbin/pkg_install/add/perform.c
--- a/usr.sbin/pkg_install/add/perform.c        Sun Nov 24 22:22:14 2002 +0000
+++ b/usr.sbin/pkg_install/add/perform.c        Sun Nov 24 22:22:42 2002 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.63.2.6 2002/11/24 22:22:14 tron Exp $    */
+/*     $NetBSD: perform.c,v 1.63.2.7 2002/11/24 22:22:42 tron 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.63.2.6 2002/11/24 22:22:14 tron Exp $");
+__RCSID("$NetBSD: perform.c,v 1.63.2.7 2002/11/24 22:22:42 tron Exp $");
 #endif
 #endif
 
@@ -718,7 +718,9 @@
                err_cnt = pkg_do(NULL);
        else {
                while ((lpp = TAILQ_FIRST(pkgs)) != NULL) {
+                       path_prepend_from_pkgname(lpp->lp_name);
                        err_cnt += pkg_do(lpp->lp_name);
+                       path_remove_first();
                        TAILQ_REMOVE(pkgs, lpp, lp_link);
                        free_lpkg(lpp);
                }