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

Handle circular dependencies properly (via errx(3)) rather than dumping

Browse Source 
core.  This bug was made visible by a recent change to the audio/timidity++
port, which now has itself as a run dependency.

Reported by:	Emil Mikulic, Andreas Klemm
This commit is contained in:
Colin Percival 2005-09-17 15:30:16 +00:00
parent 90412be1fd
commit 6a15313d24
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.sbin/portsnap/make_index/make_index.c
View File

@ -305,15 +305,28 @@ recurse_one(DEP * d, size_t * nd)
static void
recurse(PORT * p)
{
if (p->recursed != 0)
switch (p->recursed) {
case 0:
/* First time we've seen this port */
p->recursed = 1;
break;
case 1:
/* We're in the middle of recursing this port */
errx(1, "Circular dependency loop found: %s"
" depends upon itself.\n", p->pkgname);
case 2:
/* This port has already been recursed */
return;
p->recursed = 1;
}
p->edep = recurse_one(p->edep, &p->n_edep);
p->pdep = recurse_one(p->pdep, &p->n_pdep);
p->fdep = recurse_one(p->fdep, &p->n_fdep);
p->bdep = recurse_one(p->bdep, &p->n_bdep);
p->rdep = recurse_one(p->rdep, &p->n_rdep);
/* Finished recursing on this port */
p->recursed = 2;
}
/* Heapify an element in a package list */