From 53de7bb742eaf2589fd7520bbbd36d5e3e4948de Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 19 Sep 2008 11:49:52 +0000
Subject: drop unused code: commercial cd is no more

---
 perl-install/install/any.pm               |  1 -
 perl-install/install/steps_interactive.pm |  6 ------
 perl-install/messages.pm                  | 32 -------------------------------
 3 files changed, 39 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});
diff --git a/perl-install/messages.pm b/perl-install/messages.pm
index 354ebea19..87a558913 100644
--- a/perl-install/messages.pm
+++ b/perl-install/messages.pm
@@ -93,38 +93,6 @@ MP3 decoders included may require a licence for further usage (see
 http://www.mp3licensing.com for more details). If you are unsure if a patent
 may be applicable to you, check your local laws.");
 }
-sub com_license() { 
-#-PO: keep the double empty lines between sections, this is formatted a la LaTeX
-N("
-Warning
-
-Please read carefully the terms below. If you disagree with any
-portion, you are not allowed to install the next CD media. Press 'Refuse' 
-to continue the installation without using these media.
-
-
-Some components contained in the next CD media are not governed
-by the GPL License or similar agreements. Each such component is then
-governed by the terms and conditions of its own specific license. 
-Please read carefully and comply with such specific licenses before 
-you use or redistribute the said components. 
-Such licenses will in general prevent the transfer,  duplication 
-(except for backup purposes), redistribution, reverse engineering, 
-de-assembly, de-compilation or modification of the component. 
-Any breach of agreement will immediately terminate your rights under 
-the specific license. Unless the specific license terms grant you such
-rights, you usually cannot install the programs on more than one
-system, or adapt it to be used on a network. In doubt, please contact 
-directly the distributor or editor of the component. 
-Transfer to third parties or copying of such components including the 
-documentation is usually forbidden.
-
-
-All rights to the components of the next CD media belong to their 
-respective authors and are protected by intellectual property and 
-copyright laws applicable to software programs.
-");
-}
 
 sub install_completed() {
 #-PO: keep the double empty lines between sections, this is formatted a la LaTeX
-- 
cgit v1.2.1