diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-08-23 10:03:27 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-08-23 10:03:27 +0000 |
| commit | 380b45c2738161e52be5aebb400efe0f37cf2016 (patch) | |
| tree | 177a45ebf2269d3e0d07579d49c8d703c9f6e8ff | |
| parent | e87b5ef0b5e97b43e645afe5dab5dbb48c21be8e (diff) | |
| download | drakx-380b45c2738161e52be5aebb400efe0f37cf2016.tar drakx-380b45c2738161e52be5aebb400efe0f37cf2016.tar.gz drakx-380b45c2738161e52be5aebb400efe0f37cf2016.tar.bz2 drakx-380b45c2738161e52be5aebb400efe0f37cf2016.tar.xz drakx-380b45c2738161e52be5aebb400efe0f37cf2016.zip | |
- fix typo making selectKeyboard step not called
(and ensure it doesn't happen again)
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/steps_list.pm | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 5ec53b727..b13abaff8 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- fix typo making selectKeyboard step not called - diskdrake: o change the legend and the colors per partition - drop /etc/sysconfig/usb configuration (not used anymore in initscripts) diff --git a/perl-install/install/steps_list.pm b/perl-install/install/steps_list.pm index 40566b3a6..753484cc4 100644 --- a/perl-install/install/steps_list.pm +++ b/perl-install/install/steps_list.pm @@ -20,7 +20,7 @@ use common; 'banner-sys', N_("_: Keep these entry short\nHard drive detection") ], selectInstallClass => [ N_("_: Keep these entry short\nInstallation class"), 1, 1, '1', '', 'banner-sys', N("_: Keep these entry short\nInstallation class") ], - selectKeyboard => [ N_("_: Keep these entry short\nKeyboard"), 1, 1, '1', 'banner-languages', N("Localization") ], + selectKeyboard => [ N_("_: Keep these entry short\nKeyboard"), 1, 1, '1', '', 'banner-languages', N("Localization") ], miscellaneous => [ N_("_: Keep these entry short\nSecurity"), 1, 1, '1', '', 'banner-security', N("Security") ], doPartitionDisks => [ N_("_: Keep these entry short\nPartitioning"), 1, 0, '', "selectInstallClass", 'banner-part', N("Partitioning") ], @@ -49,6 +49,7 @@ use common; ); for (my $i = 0; $i < @installSteps; $i += 2) { my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] }; + !$h{banner_icon} || $h{banner_icon} =~ /^banner/ or internal_error("bad banner_icon for step $installSteps[$i]"); $h{entered} = 0; $h{onError} = $installSteps[$i + 2 * $h{onError}]; $h{reachable} = !$h{needs}; |