d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In a origin lookup mode (-O) don't bail out when encountering empty package

Browse Source 
directory, because this prevent this option from being used from the
package-depends target of bsd.port.mk since it creates such empty dir
during its normal operation.

MFC after:	6 days
This commit is contained in:
Maxim Sobolev 2002-05-05 20:50:27 +00:00
parent 18074efb5e
commit f351f851db
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/pkg_install/info/perform.c
View File

@ -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);