summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2002-05-05 20:50:27 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2002-05-05 20:50:27 +0000
commitf351f851db174dc3cbe864a3da71a1b99d2260d4 (patch)
tree0ff14c0baabd4155ee00d534ac336c0b39f59706 /usr.sbin
parent18074efb5ecb7ceba4cd12078f97fee54f3e73f8 (diff)
Notes
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_install/info/perform.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c
index 99967e3d2940..538d2ae759d7 100644
--- a/usr.sbin/pkg_install/info/perform.c
+++ b/usr.sbin/pkg_install/info/perform.c
@@ -440,8 +440,14 @@ find_pkgs_by_origin(const char *db_dir, const char *origin)
char *cp, tmp[PATH_MAX];
int cmd;
- snprintf(tmp, PATH_MAX, "%s/%s/%s", db_dir, installed[i],
- CONTENTS_FNAME);
+ snprintf(tmp, PATH_MAX, "%s/%s", db_dir, installed[i]);
+ /*
+ * SPECIAL CASE: ignore empty dirs, since we can can see them
+ * during port installation.
+ */
+ if (isemptydir(tmp))
+ continue;
+ snprintf(tmp, PATH_MAX, "%s/%s", tmp, CONTENTS_FNAME);
fp = fopen(tmp, "r");
if (fp == NULL) {
warn("%s", tmp);