diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:27:10 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:27:10 +0000 |
| commit | 81f539976d18ddbbedd2478d305e109a8aea7213 (patch) | |
| tree | e80f3efad047dfc26eb806f0136142c49f7cf850 /perl-install/install/install2.pm | |
| parent | c370b328a8447e6e82d0caa04f7d29cfb4e0bd80 (diff) | |
| download | drakx-backup-do-not-use-81f539976d18ddbbedd2478d305e109a8aea7213.tar drakx-backup-do-not-use-81f539976d18ddbbedd2478d305e109a8aea7213.tar.gz drakx-backup-do-not-use-81f539976d18ddbbedd2478d305e109a8aea7213.tar.bz2 drakx-backup-do-not-use-81f539976d18ddbbedd2478d305e109a8aea7213.tar.xz drakx-backup-do-not-use-81f539976d18ddbbedd2478d305e109a8aea7213.zip | |
(init_mouse) split it out of main()
Diffstat (limited to 'perl-install/install/install2.pm')
| -rw-r--r-- | perl-install/install/install2.pm | 10 |
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 |