projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[cascardo/linux.git]
/
scripts
/
kconfig
/
zconf.l
diff --git
a/scripts/kconfig/zconf.l
b/scripts/kconfig/zconf.l
index
5164ef7
..
21ff69c
100644
(file)
--- a/
scripts/kconfig/zconf.l
+++ b/
scripts/kconfig/zconf.l
@@
-314,11
+314,14
@@
void zconf_nextfile(const char *name)
current_buf = buf;
if (file->flags & FILE_BUSY) {
current_buf = buf;
if (file->flags & FILE_BUSY) {
- printf("recursive scan (%s)?\n", name);
+ printf("%s:%d: do not source '%s' from itself\n",
+ zconf_curname(), zconf_lineno(), name);
exit(1);
}
if (file->flags & FILE_SCANNED) {
exit(1);
}
if (file->flags & FILE_SCANNED) {
- printf("file %s already scanned?\n", name);
+ printf("%s:%d: file '%s' is already sourced from '%s'\n",
+ zconf_curname(), zconf_lineno(), name,
+ file->parent->name);
exit(1);
}
file->flags |= FILE_BUSY;
exit(1);
}
file->flags |= FILE_BUSY;