From: Naveen Albert <asterisk@phreaknet.org>
Date: Thu, 4 Jan 2024 18:05:32 +0000 (+0000)
Subject: menuselect: Use more specific error message.
X-Git-Tag: 21.1.0-rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=625826afd4df0fca1f9060bd891b00ffac3fa0d4;p=thirdparty%2Fasterisk.git

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
(cherry picked from commit 7683259f378a34f1b483f05537a5d093d98ca4d8)
---

diff --git a/menuselect/menuselect.c b/menuselect/menuselect.c
index 54283edabf..222d0d79e5 100644
--- a/menuselect/menuselect.c
+++ b/menuselect/menuselect.c
@@ -1933,14 +1933,17 @@ static int sanity_check(void)
 				fprintf(stderr, "\n"
 					"***********************************************************\n"
 					"  The existing menuselect.makeopts file did not specify    \n"
-					"  that '%s' should not be included.  However, either some  \n"
-					"  dependencies for this module were not found or a         \n"
-					"  conflict exists.                                         \n"
+					"  that '%s' should not be included.  However,              \n"
+					"  %s%s\n"
+					"  %s.\n"
 					"                                                           \n"
 					"  Either run 'make menuselect' or remove the existing      \n"
 					"  menuselect.makeopts file to resolve this issue.          \n"
 					"***********************************************************\n"
-					"\n", mem->name);
+					"\n", mem->name,
+					mem->depsfailed ? "dependencies for this module were not found" : "",
+					mem->depsfailed && mem->conflictsfailed ? " and" : "",
+					mem->conflictsfailed ? "a conflict exists" : "");
 				insane = 1;
 			}
 		}