summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-05-23 18:27:10 +0000
committerThierry Vignaud <tv@mageia.org>2012-05-23 18:27:10 +0000
commita67e86c7bfabde7e68af094d6f8aeaae71d206ba (patch)
treee80f3efad047dfc26eb806f0136142c49f7cf850
parent0bb1667297eff25add0340af9efdaf97b2979177 (diff)
downloaddrakx-a67e86c7bfabde7e68af094d6f8aeaae71d206ba.tar
drakx-a67e86c7bfabde7e68af094d6f8aeaae71d206ba.tar.gz
drakx-a67e86c7bfabde7e68af094d6f8aeaae71d206ba.tar.bz2
drakx-a67e86c7bfabde7e68af094d6f8aeaae71d206ba.tar.xz
drakx-a67e86c7bfabde7e68af094d6f8aeaae71d206ba.zip
(init_mouse) split it out of main()
-rw-r--r--perl-install/install/install2.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 3170d17c4..c3fb2fe03 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -530,6 +530,11 @@ sub init_env_share() {
}
}
+sub init_mouse() {
+ eval { $o->{mouse} = mouse::detect($o->{modules_conf}) } if !$o->{mouse} && !$o->{nomouseprobe};
+ mouse::load_modules($o->{mouse});
+}
+
sub process_auto_steps() {
foreach (@::auto_steps) {
if (my $s = $o->{steps}{/::(.*)/ ? $1 : $_}) {
@@ -631,10 +636,7 @@ sub main {
devices::make('tty') if $o->{interactive} eq "curses";
#- needed very early for install::steps_gtk
- if (!$::testing) {
- eval { $o->{mouse} = mouse::detect($o->{modules_conf}) } if !$o->{mouse} && !$o->{nomouseprobe};
- mouse::load_modules($o->{mouse});
- }
+ init_mouse() if !$::testing;
#- for auto_install compatibility with old $o->{lang},
#- and also for --lang and --flang