summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjlam <jlam>2003-09-10 17:31:49 +0000
committerjlam <jlam>2003-09-10 17:31:49 +0000
commit1a9f66eabee8539c0719234b63b351b650161c93 (patch)
treefcbd8a02d5345ac9957a6f2b94c566e326938349 /pkgtools
parent8b33f785042acf8a55bd722ad389e9ef2b67672a (diff)
downloadpkgsrc-1a9f66eabee8539c0719234b63b351b650161c93.tar.gz
Pull in rev 1.49 of perform.c from src/usr.sbin/pkg_install/info. This
fixes a bug where the pkg_dbdir could no longer be a symlink to a directory.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_install/files/info/perform.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgtools/pkg_install/files/info/perform.c b/pkgtools/pkg_install/files/info/perform.c
index 15f1b0ac015..c5f6e2e8856 100644
--- a/pkgtools/pkg_install/files/info/perform.c
+++ b/pkgtools/pkg_install/files/info/perform.c
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.10 2003/09/09 13:34:21 jlam Exp $ */
+/* $NetBSD: perform.c,v 1.11 2003/09/10 17:31:49 jlam Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -11,7 +11,7 @@
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.23 1997/10/13 15:03:53 jkh Exp";
#else
-__RCSID("$NetBSD: perform.c,v 1.10 2003/09/09 13:34:21 jlam Exp $");
+__RCSID("$NetBSD: perform.c,v 1.11 2003/09/10 17:31:49 jlam Exp $");
#endif
#endif
@@ -343,7 +343,7 @@ pkg_perform(lpkg_head_t *pkghead)
if (CheckPkg) {
err_cnt += CheckForPkg(CheckPkg, dbdir);
} else if (AllInstalled) {
- if (!isdir(dbdir))
+ if (!(isdir(dbdir) || islinktodir(dbdir)))
return 1;
if (File2Pkg) {