diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-06-18 04:45:42 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-06-18 04:45:42 +0000 |
| commit | 108c126d0809ce2578c6ac2e66cf33d0759cbd8d (patch) | |
| tree | 57b43c67e6a14751b310cee8f13aaf2a1fd1a59a | |
| parent | 22854388195d27c2668250529e843a946e4d82ab (diff) | |
| download | drakx-108c126d0809ce2578c6ac2e66cf33d0759cbd8d.tar drakx-108c126d0809ce2578c6ac2e66cf33d0759cbd8d.tar.gz drakx-108c126d0809ce2578c6ac2e66cf33d0759cbd8d.tar.bz2 drakx-108c126d0809ce2578c6ac2e66cf33d0759cbd8d.tar.xz drakx-108c126d0809ce2578c6ac2e66cf33d0759cbd8d.zip | |
Don't ask a supplementary CD for upgrades
| -rw-r--r-- | perl-install/install_any.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 857fd136e..89d27fe6b 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -303,8 +303,9 @@ sub setPackages { #- ask whether there are supplementary CDs SUPPL: { - #- TODO don't ask this for an upgrade: the suppl.CD should aldready be listed in the media - if ($suppl_CDs && $o->ask_yesorno('', N("Do you have a supplementary CD to install?"), 0)) { + if ($suppl_CDs && !$o->{isUpgrade} + && $o->ask_yesorno('', N("Do you have a supplementary CD to install?"), 0)) + { #- by convention, the media names for suppl. CDs match /^\d+s$/ my $medium = '1s'; #- supplement 1 local $::isWizard = 0; |