kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pull over v1.51 from src/usr.sbin:

Browse source 
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
This commit is contained in:
wiz 2006-04-04 06:25:59 +00:00
parent 864c7d4c33
commit 3774c1a14d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgtools/pkg_install/files/admin/main.c
View file

@ -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 @@ main(int argc, char *argv[])
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 @@ main(int argc, char *argv[])
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");