diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-01-03 10:15:35 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-01-03 10:15:35 +0000 |
| commit | 9ee1d2a5e87fd1de5f9162f0a101145756451956 (patch) | |
| tree | d49d2d17f1740284cf29a0b009cb78e7544c5cd3 | |
| parent | d5c87faaaf828083638b50c7078e6cca2916f6fd (diff) | |
| download | drakx-9ee1d2a5e87fd1de5f9162f0a101145756451956.tar drakx-9ee1d2a5e87fd1de5f9162f0a101145756451956.tar.gz drakx-9ee1d2a5e87fd1de5f9162f0a101145756451956.tar.bz2 drakx-9ee1d2a5e87fd1de5f9162f0a101145756451956.tar.xz drakx-9ee1d2a5e87fd1de5f9162f0a101145756451956.zip | |
fixed usage with testing
| -rw-r--r-- | perl-install/install2.pm | 3 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 29c251ab2..fc07b9693 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -432,7 +432,8 @@ sub configureX { fs::write($o->{prefix}, $o->{fstab}, $o->{manualFstab}, $o->{useSupermount}); modules::write_conf($o->{prefix}); - $o->configureX($clicked) if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) && !$o->{X}{disabled} || $clicked; + require pkgs; + $o->configureX($clicked) if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) && !$o->{X}{disabled} || $clicked || $::testing; } #------------------------------------------------------------------------------ sub generateAutoInstFloppy { $o->generateAutoInstFloppy } diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 55dbf6849..11abcb06c 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -302,7 +302,11 @@ sub pkg_install { my ($o, @l) = @_; log::l("selecting packages"); require pkgs; - pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_) || die "$_ rpm not found") foreach @l; + if ($::testing) { + log::l("selecting package \"$_\"") foreach @l; + } else { + pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_) || die "$_ rpm not found") foreach @l; + } my @toInstall = pkgs::packagesToInstall($o->{packages}); if (@toInstall) { log::l("installing packages"); |