From 35a86eeb69968a8c5327e3a4dfcc4e6f96fceee1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 12 Apr 2001 12:32:59 +0000
Subject: (ask_from_entries_refH_powered_normalize): - when not_edit and empty
 list, die. - when not_edit and single element list, don't display that entry.

---
 perl-install/interactive.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 596b40d15..567c2cef8 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -245,8 +245,12 @@ sub ask_from_entries_refH_powered_normalize {
 	$e->{disabled} ||= sub { 0 };
     }
 
-    #- don't display empty lists
-    @$l = grep { !($_->{list} && @{$_->{list}} == () && $_->{not_edit}) } @$l;
+    #- don't display empty lists and one element lists
+    @$l = grep { 
+	my $b = $_->{list} && $_->{not_edit};
+	@{$_->{list}} == () and die 'ask_from_list: empty list';
+	!($b && @{$_->{list}} <= 1);
+    } @$l;
 
     $common->{advanced_label} ||= _("Advanced");
     $common->{$_} = [ deref($common->{$_}) ] foreach qw(messages advanced_messages);
-- 
cgit v1.2.1

v2008.1</option>
<option value='distro/mdv2009.0'>distro/mdv2009.0</option>
<option value='distro/mdv2009.1'>distro/mdv2009.1</option>
<option value='distro/mdv2010.0'>distro/mdv2010.0</option>
<option value='distro/mes5'>distro/mes5</option>
<option value='distro/mes5-2.6.33'>distro/mes5-2.6.33</option>
<option value='distro/mes6'>distro/mes6</option>
<option value='distro/mga1'>distro/mga1</option>
<option value='distro/mga2'>distro/mga2</option>
<option value='distro/mga3'>distro/mga3</option>
<option value='distro/mga4'>distro/mga4</option>
<option value='distro/mga5'>distro/mga5</option>
<option value='distro/mga6'>distro/mga6</option>
<option value='distro/mga7'>distro/mga7</option>
<option value='distro/mga8'>distro/mga8</option>
<option value='distro/mga9'>distro/mga9</option>
<option value='master'>master</option>
<option value='topic/Corpo_2_1'>topic/Corpo_2_1</option>
<option value='topic/KA9_0'>topic/KA9_0</option>
<option value='topic/MDK-10-update'>topic/MDK-10-update</option>
<option value='topic/MDK-10_1-update'>topic/MDK-10_1-update</option>
<option value='topic/MDK-10_2-update'>topic/MDK-10_2-update</option>
<option value='topic/MDK-2006_0-update'>topic/MDK-2006_0-update</option>
<option value='topic/MDK92-branch'>topic/MDK92-branch</option>
<option value='topic/MDKC_1_0'>topic/MDKC_1_0</option>
<option value='topic/PCMCIA_CS_DISTRO'>topic/PCMCIA_CS_DISTRO</option>
<option value='topic/R9_0-64bit-branch'>topic/R9_0-64bit-branch</option>
<option value='topic/R9_1_HP-branch'>topic/R9_1_HP-branch</option>
<option value='topic/a'>topic/a</option>
<option value='topic/before_matchbox_wm'>topic/before_matchbox_wm</option>
<option value='topic/bug-13680'>topic/bug-13680</option>
<option value='topic/dietlibc'>topic/dietlibc</option>
<option value='topic/efi'>topic/efi</option>
<option value='topic/extlinux'>topic/extlinux</option>
<option value='topic/firewall'>topic/firewall</option>
<option value='topic/gdk-pixbuf-0-branch'>topic/gdk-pixbuf-0-branch</option>
<option value='topic/gi-ppc'>topic/gi-ppc</option>
<option value='topic/ia64-8_1'>topic/ia64-8_1</option>
<option value='topic/mandrakesoft'>topic/mandrakesoft</option>
<option value='topic/mlcd4'>topic/mlcd4</option>
<option value='topic/ppp'>topic/ppp</option>
<option value='topic/rp-pppoe'>topic/rp-pppoe</option>
<option value='topic/switching_to_dnf'>topic/switching_to_dnf</option>
<option value='topic/switching_to_urpmi'>topic/switching_to_urpmi</option>
<option value='topic/unlabeled-1.1.1'>topic/unlabeled-1.1.1</option>
<option value='topic/v_webmin_0_87'>topic/v_webmin_0_87</option>
<option value='topic/x86_64-branch'>topic/x86_64-branch</option>
<option value='user/animtim/designWork'>user/animtim/designWork</option>
<option value='user/bcornec/fixntp'>user/bcornec/fixntp</option>
<option value='user/colin/rescue-systemd'>user/colin/rescue-systemd</option>
<option value='user/ennael/mga6'>user/ennael/mga6</option>
<option value='user/erwan/bug-13680'>user/erwan/bug-13680</option>
<option value='user/jibz/aarch64'>user/jibz/aarch64</option>
<option value='user/martinw/mga6'>user/martinw/mga6</option>
<option value='user/pterjan/arm64'>user/pterjan/arm64</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Mageia Installer and base platform for many utilities</td><td class='sub right'>Thierry Vignaud [tv]</td></tr></table>
<table class='tabs'><tr><td>
<a href='/software/drakx/?h=16.96'>summary</a><a href='/software/drakx/refs/?h=16.96&amp;id=93489676e60aba84b02a21751d8042d7ac607ec1'>refs</a><a href='/software/drakx/log/kernel/update_kernel?h=16.96'>log</a><a href='/software/drakx/tree/kernel/update_kernel?h=16.96&amp;id=93489676e60aba84b02a21751d8042d7ac607ec1'>tree</a><a class='active' href='/software/drakx/commit/kernel/update_kernel?h=16.96&amp;id=93489676e60aba84b02a21751d8042d7ac607ec1'>commit</a><a href='/software/drakx/diff/kernel/update_kernel?h=16.96&amp;id=93489676e60aba84b02a21751d8042d7ac607ec1'>diff</a><a href='/software/drakx/stats/kernel/update_kernel?h=16.96'>stats</a></td><td class='form'><form class='right' method='get' action='/software/drakx/log/kernel/update_kernel'>
<input type='hidden' name='h' value='16.96'/><input type='hidden' name='id' value='93489676e60aba84b02a21751d8042d7ac607ec1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/software/drakx/commit/?h=16.96&amp;id=93489676e60aba84b02a21751d8042d7ac607ec1'>root</a>/<a href='/software/drakx/commit/kernel?h=16.96&amp;id=93489676e60aba84b02a21751d8042d7ac607ec1'>kernel</a>/<a href='/software/drakx/commit/kernel/update_kernel?h=16.96&amp;id=93489676e60aba84b02a21751d8042d7ac607ec1'>update_kernel</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='16.96'/><input type='hidden' name='id' value='93489676e60aba84b02a21751d8042d7ac607ec1'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Francois Pons &lt;fpons@mandriva.com&gt;</td><td class='right'>2003-01-08 13:49:27 +0000</td></tr>
<tr><th>committer</th><td>Francois Pons &lt;fpons@mandriva.com&gt;</td><td class='right'>2003-01-08 13:49:27 +0000</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/software/drakx/commit/kernel/update_kernel?h=16.96&amp;id=93489676e60aba84b02a21751d8042d7ac607ec1'>93489676e60aba84b02a21751d8042d7ac607ec1</a> (<a href='/software/drakx/patch/kernel/update_kernel?id=93489676e60aba84b02a21751d8042d7ac607ec1'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/software/drakx/tree/?h=16.96&amp;id=93489676e60aba84b02a21751d8042d7ac607ec1'>6a19cc70e6a0b60740f126b52be678bf3df5d8aa</a> /<a href='/software/drakx/tree/kernel/update_kernel?h=16.96&amp;id=93489676e60aba84b02a21751d8042d7ac607ec1'>kernel/update_kernel</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/software/drakx/commit/kernel/update_kernel?h=16.96&amp;id=c92842d727cfe4e9589f312870fc79defba8f1f6'>c92842d727cfe4e9589f312870fc79defba8f1f6</a> (<a href='/software/drakx/diff/kernel/update_kernel?h=16.96&amp;id=93489676e60aba84b02a21751d8042d7ac607ec1&amp;id2=c92842d727cfe4e9589f312870fc79defba8f1f6'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/software/drakx/snapshot/drakx-93489676e60aba84b02a21751d8042d7ac607ec1.tar'>drakx-93489676e60aba84b02a21751d8042d7ac607ec1.tar</a><br/><a href='/software/drakx/snapshot/drakx-93489676e60aba84b02a21751d8042d7ac607ec1.tar.gz'>drakx-93489676e60aba84b02a21751d8042d7ac607ec1.tar.gz</a><br/><a href='/software/drakx/snapshot/drakx-93489676e60aba84b02a21751d8042d7ac607ec1.tar.bz2'>drakx-93489676e60aba84b02a21751d8042d7ac607ec1.tar.bz2</a><br/><a href='/software/drakx/snapshot/drakx-93489676e60aba84b02a21751d8042d7ac607ec1.tar.xz'>drakx-93489676e60aba84b02a21751d8042d7ac607ec1.tar.xz</a><br/><a href='/software/drakx/snapshot/drakx-93489676e60aba84b02a21751d8042d7ac607ec1.zip'>drakx-93489676e60aba84b02a21751d8042d7ac607ec1.zip</a><br/></td></tr></table>
<div class='commit-subject'>definitively fixed bad version and release retrieved from BOOT kernel.</div><div class='commit-msg'>