diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-01-07 20:29:31 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-01-07 20:29:31 +0000 |
| commit | f2dffc6fa695defa60e90367426b806921b74a64 (patch) | |
| tree | 73461fe24e1a8229384c461e2d1bb629dbf0acb0 | |
| parent | 7adaee28ae783f618ba2b271963423f18df94de0 (diff) | |
| download | drakx-f2dffc6fa695defa60e90367426b806921b74a64.tar drakx-f2dffc6fa695defa60e90367426b806921b74a64.tar.gz drakx-f2dffc6fa695defa60e90367426b806921b74a64.tar.bz2 drakx-f2dffc6fa695defa60e90367426b806921b74a64.tar.xz drakx-f2dffc6fa695defa60e90367426b806921b74a64.zip | |
cleanup
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 0305a7bb7..a24c0ae99 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -299,7 +299,7 @@ sub configureX { modules::write_conf($o->{prefix}); require pkgs; - installStepsCall($o, $auto, 'configureX', $clicked) if pkgs::packageByName($o->{packages}, 'XFree86')->flag_installed && !$o->{X}{disabled} || $clicked || $::testing; + installStepsCall($o, $auto, 'configureX') if pkgs::packageByName($o->{packages}, 'XFree86')->flag_installed && !$o->{X}{disabled} || $::testing; } #------------------------------------------------------------------------------ sub exitInstall { diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index de992bc1f..eb51551b2 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -906,14 +906,14 @@ sub configureXBefore { } sub configureX { my ($o) = @_; - $o->configureXBefore; + configureXBefore($o); require Xconfig::main; Xconfig::main::configure_everything_auto_install($o->{raw_X}, $o->do_pkgs, $o->{X}, { allowFB => $o->{allowFB}, allowNVIDIA_rpms => install_any::allowNVIDIA_rpms($o->{packages}), }); - $o->configureXAfter; + configureXAfter($o); } sub configureXAfter { my ($o) = @_; |