diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2002-12-04 21:24:11 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2002-12-04 21:24:11 +0000 |
commit | 76694f9e89f004ba696607e27bc5d39243005a69 (patch) | |
tree | 4b312f2a327e56714d5efdd9dd628ab637212b82 | |
parent | 868f8ef6acc35e7f402f082fb8398c22bbd012b5 (diff) | |
download | drakx-76694f9e89f004ba696607e27bc5d39243005a69.tar drakx-76694f9e89f004ba696607e27bc5d39243005a69.tar.gz drakx-76694f9e89f004ba696607e27bc5d39243005a69.tar.bz2 drakx-76694f9e89f004ba696607e27bc5d39243005a69.tar.xz drakx-76694f9e89f004ba696607e27bc5d39243005a69.zip |
remove unused code (installCrypto)
-rw-r--r-- | perl-install/install2.pm | 5 | ||||
-rw-r--r-- | perl-install/install_steps.pm | 10 | ||||
-rw-r--r-- | perl-install/install_steps_interactive.pm | 32 |
3 files changed, 0 insertions, 47 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 78296fff0..190585859 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -243,11 +243,6 @@ sub configureNetwork { installStepsCall($o, $auto, 'configureNetwork', $ent_number == 1, $clicked); } #------------------------------------------------------------------------------ -sub installCrypto { - my ($_clicked, $_ent_number, $auto) = @_; - installStepsCall($o, $auto, 'installCrypto'); -} -#------------------------------------------------------------------------------ sub installUpdates { my ($_clicked, $_ent_number, $auto) = @_; installStepsCall($o, $auto, 'installUpdates'); diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 23c89d2c1..49caee3f2 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -635,16 +635,6 @@ sub configureNetwork { } #------------------------------------------------------------------------------ -sub installCrypto { - my ($o) = @_; - my $u = $o->{crypto} or return; $u->{mirror} && $u->{packages} or return; - - upNetwork($o); - require crypto; - my @_crypto_packages = crypto::getPackages($o->{prefix}, $o->{packages}, $u->{mirror}); - $o->pkg_install(@{$u->{packages}}); -} - sub installUpdates { my ($o) = @_; my $u = $o->{updates} or return; $u->{updates} or return; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 21d097ae0..8e2f1dfc5 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -849,38 +849,6 @@ sub configureNetwork { #------------------------------------------------------------------------------ #-pppConfig moved to any.pm #------------------------------------------------------------------------------ -sub installCrypto { - my $license = -N("You now have the opportunity to download encryption software. - -WARNING: - -Due to different general requirements applicable to these software and imposed -by various jurisdictions, customer and/or end user of theses software should -ensure that the laws of his/their jurisdiction allow him/them to download, stock -and/or use these software. - -In addition customer and/or end user shall particularly be aware to not infringe -the laws of his/their jurisdiction. Should customer and/or end user not -respect the provision of these applicable laws, he/they will incure serious -sanctions. - -In no event shall Mandrakesoft nor its manufacturers and/or suppliers be liable -for special, indirect or incidental damages whatsoever (including, but not -limited to loss of profits, business interruption, loss of commercial data and -other pecuniary losses, and eventual liabilities and indemnification to be paid -pursuant to a court decision) arising out of use, possession, or the sole -downloading of these software, to which customer and/or end user could -eventually have access after having sign up the present agreement. - - -For any queries relating to these agreement, please contact -Mandrakesoft, Inc. -2400 N. Lincoln Avenue Suite 243 -Altadena California 91001 -USA"); - goto &installUpdates; #- remove old code, keep this one ok though by transfering to installUpdates. -} sub installUpdates { my ($o) = @_; |