diff options
| author | Francois Pons <fpons@mandriva.com> | 1999-10-01 15:57:39 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 1999-10-01 15:57:39 +0000 |
| commit | 3cf33eab50fd8e7eb927c617986f62938e0485a1 (patch) | |
| tree | 9f585993cd1b4d0cace49969a118ea56227044f9 /perl-install/install2.pm | |
| parent | 4d03533983eda1325e04122a4dc478d892862471 (diff) | |
| download | drakx-3cf33eab50fd8e7eb927c617986f62938e0485a1.tar drakx-3cf33eab50fd8e7eb927c617986f62938e0485a1.tar.gz drakx-3cf33eab50fd8e7eb927c617986f62938e0485a1.tar.bz2 drakx-3cf33eab50fd8e7eb927c617986f62938e0485a1.tar.xz drakx-3cf33eab50fd8e7eb927c617986f62938e0485a1.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 2cf475a53..fbf52a641 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -212,7 +212,7 @@ sub selectLanguage { sub selectMouse { my ($clicked) = $_[0]; - $o->{mouse} or $o->{mouse} = {}; + $o->{mouse} ||= {}; add2hash($o->{mouse}, { mouse::read($o->{prefix}) }) if $o->{isUpgrade} && !$clicked; $o->selectMouse($clicked); @@ -327,9 +327,10 @@ sub selectInstallClass { $o->{partitions} ||= $suggestedPartitions{$o->{installClass}}; $o->{partitioning}{auto_allocate} ||= -1 if $::beginner; - $o->setPackages(\@install_classes) - if $o->{steps}{choosePackages}{entered} >= 1 && - !$o->{steps}{doInstallStep}{done}; + if ($o->{steps}{choosePackages}{entered} >= 1 && !$o->{steps}{doInstallStep}{done}) { + $o->setPackages(\@install_classes); + $o->findPackagesToUpgrade() if $o->{isUpgrade}; + } } #------------------------------------------------------------------------------ @@ -403,6 +404,7 @@ sub formatPartitions { #-PADTODO sub choosePackages { $o->setPackages($o, \@install_classes) if $_[1] == 1; + $o->findPackagesToUpgrade($o) if $o->{isUpgrade} && $_[1] == 1; $o->choosePackages($o->{packages}, $o->{compss}); $o->{packages}{$_}{selected} = 1 foreach @{$o->{base}}; } |