<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15628">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">menuselect: exit non-zero in case of failure on --enable|disable options.<br><br>ASTERISK-29348<br><br>Change-Id: I77e3466435f5a51a57538b29addb68d811af238d<br>Signed-off-by: Jaco Kroon <jaco@uls.co.za><br>---<br>A doc/UPGRADE-staging/menuselect-could-fail.txt<br>M menuselect/menuselect.c<br>M tests/CI/buildAsterisk.sh<br>3 files changed, 11 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/UPGRADE-staging/menuselect-could-fail.txt b/doc/UPGRADE-staging/menuselect-could-fail.txt</span><br><span>new file mode 100644</span><br><span>index 0000000..e3e20ed</span><br><span>--- /dev/null</span><br><span>+++ b/doc/UPGRADE-staging/menuselect-could-fail.txt</span><br><span>@@ -0,0 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: menuselect</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+menuselect --enable, --disable, --enable-category and --disable-category will</span><br><span style="color: hsl(120, 100%, 40%);">+now fail with a non-zero exit code instead of silently failing if an invalid</span><br><span style="color: hsl(120, 100%, 40%);">+option or category is specified.</span><br><span>diff --git a/menuselect/menuselect.c b/menuselect/menuselect.c</span><br><span>index 2ef075f..615e29f 100644</span><br><span>--- a/menuselect/menuselect.c</span><br><span>+++ b/menuselect/menuselect.c</span><br><span>@@ -2120,6 +2120,7 @@</span><br><span> /* Reset options processing */</span><br><span> option_index = 0;</span><br><span> optind = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ res = 0;</span><br><span> </span><br><span> while ((c = getopt_long(argc, argv, "", long_options, &option_index)) != -1) {</span><br><span> print_debug("Got option %c\n", c);</span><br><span>@@ -2130,6 +2131,7 @@</span><br><span> set_member_enabled(mem);</span><br><span> } else {</span><br><span> fprintf(stderr, "'%s' not found\n", optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ res = 1;</span><br><span> }</span><br><span> }</span><br><span> break;</span><br><span>@@ -2139,6 +2141,7 @@</span><br><span> set_all(cat, 1);</span><br><span> } else {</span><br><span> fprintf(stderr, "'%s' not found\n", optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ res = 1;</span><br><span> }</span><br><span> }</span><br><span> break;</span><br><span>@@ -2153,6 +2156,7 @@</span><br><span> clear_member_enabled(mem);</span><br><span> } else {</span><br><span> fprintf(stderr, "'%s' not found\n", optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ res = 1;</span><br><span> }</span><br><span> }</span><br><span> break;</span><br><span>@@ -2162,6 +2166,7 @@</span><br><span> set_all(cat, 0);</span><br><span> } else {</span><br><span> fprintf(stderr, "'%s' not found\n", optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ res = 1;</span><br><span> }</span><br><span> }</span><br><span> break;</span><br><span>@@ -2176,7 +2181,6 @@</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- res = 0;</span><br><span> }</span><br><span> </span><br><span> if (!res) {</span><br><span>diff --git a/tests/CI/buildAsterisk.sh b/tests/CI/buildAsterisk.sh</span><br><span>index 2deb549..d8bad70 100755</span><br><span>--- a/tests/CI/buildAsterisk.sh</span><br><span>+++ b/tests/CI/buildAsterisk.sh</span><br><span>@@ -158,7 +158,7 @@</span><br><span> </span><br><span> runner menuselect/menuselect `gen_mods disable $mod_disables` menuselect.makeopts</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mod_enables="app_voicemail app_directory FILE_STORAGE"</span><br><span style="color: hsl(120, 100%, 40%);">+ mod_enables="app_voicemail app_directory"</span><br><span> mod_enables+=" res_mwi_external res_ari_mailboxes res_mwi_external_ami res_stasis_mailbox"</span><br><span> mod_enables+=" CORE-SOUNDS-EN-GSM MOH-OPSOUND-GSM EXTRA-SOUNDS-EN-GSM"</span><br><span> runner menuselect/menuselect `gen_mods enable $mod_enables` menuselect.makeopts</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15628">change 15628</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/15628"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I77e3466435f5a51a57538b29addb68d811af238d </div>
<div style="display:none"> Gerrit-Change-Number: 15628 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: Jaco Kroon <jaco@uls.co.za> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>