mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-12-04 05:58:57 +00:00
MFC: Stop config from getting confused when a standard file is required by a
site specific option.
This commit is contained in:
parent
f313464b9c
commit
25be5768cd
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/stable/3/; revision=54076
@ -319,9 +319,15 @@ next:
|
||||
else
|
||||
isdup = 0;
|
||||
tp = 0;
|
||||
if (first == 3 && (tp = fltail_lookup(this)) != 0)
|
||||
printf("%s: Local file %s overrides %s.\n",
|
||||
fname, this, tp->f_fn);
|
||||
if (first == 3 && pf == 0 && (tp = fltail_lookup(this)) != 0) {
|
||||
if (tp->f_type != INVISIBLE || tp->f_flags)
|
||||
printf("%s: Local file %s overrides %s.\n",
|
||||
fname, this, tp->f_fn);
|
||||
else
|
||||
printf("%s: Local file %s could override %s"
|
||||
" with a different kernel configuration.\n",
|
||||
fname, this, tp->f_fn);
|
||||
}
|
||||
nreqs = 0;
|
||||
special = 0;
|
||||
depends = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user