diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-09-19 11:49:52 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-09-19 11:49:52 +0000 |
| commit | 53de7bb742eaf2589fd7520bbbd36d5e3e4948de (patch) | |
| tree | b54ff7bb76ff84cc51ae746a889924c90e260b71 /perl-install/install | |
| parent | d60e3d5e3d860f4d7ee1cc41d6d689d8424ab72f (diff) | |
| download | drakx-53de7bb742eaf2589fd7520bbbd36d5e3e4948de.tar drakx-53de7bb742eaf2589fd7520bbbd36d5e3e4948de.tar.gz drakx-53de7bb742eaf2589fd7520bbbd36d5e3e4948de.tar.bz2 drakx-53de7bb742eaf2589fd7520bbbd36d5e3e4948de.tar.xz drakx-53de7bb742eaf2589fd7520bbbd36d5e3e4948de.zip | |
drop unused code: commercial cd is no more
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/any.pm | 1 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 7b7839889..b5e97310b 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -480,7 +480,6 @@ sub rpmsrate_always_flags { $rpmsrate_flags_chosen->{HIGH_SECURITY} = 1 if $o->{security} > 3; $rpmsrate_flags_chosen->{BIGMEM} = 1 if detect_devices::BIGMEM(); $rpmsrate_flags_chosen->{SMP} = 1 if $o->{match_all_hardware} || detect_devices::hasSMP(); - $rpmsrate_flags_chosen->{CDCOM} = 1 if any { $_->{name} =~ /commercial/i } install::media::allMediums($o->{packages}); $rpmsrate_flags_chosen->{'3D'} = 1 if $o->{match_all_hardware} || detect_devices::matching_desc__regexp('Matrox.* G[245][05]0') || diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 18e204f2f..67c786a2c 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -374,12 +374,6 @@ sub ask_change_cd_ { local $| = 1; print "\a"; - if ($phys_m->{name} =~ /commercial/i) { - $o->{useless_thing_accepted2} ||= - $o->ask_from_list_('', formatAlaTeX(messages::com_license()), - [ N_("Accept"), N_("Refuse") ], "Accept") eq "Accept" or return; - } - foreach (1 .. 32) { install::media::umount_phys_medium($phys_m); install::media::openCdromTray($phys_m->{device}); |