Skip to content

Commit 73997b3

Browse files
menuselect: Use more specific error message.
Instead of using the same error message for missing dependencies and conflicts, be specific about what actually went wrong. Resolves: #520
1 parent 14bd1ce commit 73997b3

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

menuselect/menuselect.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1933,14 +1933,17 @@ static int sanity_check(void)
19331933
fprintf(stderr, "\n"
19341934
"***********************************************************\n"
19351935
" The existing menuselect.makeopts file did not specify \n"
1936-
" that '%s' should not be included. However, either some \n"
1937-
" dependencies for this module were not found or a \n"
1938-
" conflict exists. \n"
1936+
" that '%s' should not be included. However, \n"
1937+
" %s%s\n"
1938+
" %s.\n"
19391939
" \n"
19401940
" Either run 'make menuselect' or remove the existing \n"
19411941
" menuselect.makeopts file to resolve this issue. \n"
19421942
"***********************************************************\n"
1943-
"\n", mem->name);
1943+
"\n", mem->name,
1944+
mem->depsfailed ? "dependencies for this module were not found" : "",
1945+
mem->depsfailed && mem->conflictsfailed ? " and" : "",
1946+
mem->conflictsfailed ? "a conflict exists" : "");
19441947
insane = 1;
19451948
}
19461949
}

0 commit comments

Comments
 (0)