[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/admin Pull over v1.51 from ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1501894333d9
branches:  trunk
changeset: 510778:1501894333d9
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Apr 04 06:25:59 2006 +0000

description:
Pull over v1.51 from src/usr.sbin:
revision 1.51
date: 2006/03/06 20:00:10;  author: reed;  state: Exp;  lines: +4 -4
Fix the "Cannot chdir" error message to actually show the
problem directory name for lsbest and lsall.

For example:

# pkg_admin -d /usr/packages/DragonFly/1.4.0/i386/All lsbest 'gmake>0'
pkg_admin: Cannot chdir to /var/db/pkg: No such file or directory

Should show:
pkg_admin: Cannot chdir to /usr/packages/DragonFly/1.4.0/i386/All: No such file or directory

diffstat:

 pkgtools/pkg_install/files/admin/main.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 794d2c1b48c2 -r 1501894333d9 pkgtools/pkg_install/files/admin/main.c
--- a/pkgtools/pkg_install/files/admin/main.c   Tue Apr 04 06:24:39 2006 +0000
+++ b/pkgtools/pkg_install/files/admin/main.c   Tue Apr 04 06:25:59 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.19 2005/11/05 13:20:09 wiz Exp $    */
+/*     $NetBSD: main.c,v 1.20 2006/04/04 06:25:59 wiz Exp $    */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.19 2005/11/05 13:20:09 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.20 2006/04/04 06:25:59 wiz Exp $");
 #endif
 
 /*
@@ -617,7 +617,7 @@
                        fchdir(saved_wd);
                        rc = chdir(dir);
                        if (rc == -1)
-                               err(EXIT_FAILURE, "Cannot chdir to %s", _pkgdb_getPKGDB_DIR());
+                               err(EXIT_FAILURE, "Cannot chdir to %s", dir);
 
                        if (getcwd(cwd, sizeof(cwd)) == NULL)
                                err(EXIT_FAILURE, "getcwd");
@@ -660,7 +660,7 @@
                        fchdir(saved_wd);
                        rc = chdir(dir);
                        if (rc == -1)
-                               err(EXIT_FAILURE, "Cannot chdir to %s", _pkgdb_getPKGDB_DIR());
+                               err(EXIT_FAILURE, "Cannot chdir to %s", dir);
 
                        if (getcwd(cwd, sizeof(cwd)) == NULL)
                                err(EXIT_FAILURE, "getcwd");