summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-09-21 11:59:19 +0000
committerFrancois Pons <fpons@mandriva.com>2001-09-21 11:59:19 +0000
commitbc740bd9a6b1b8759c2aeeefde5eb0303445b61d (patch)
tree069f97fa8c1811a92e07243f0285436be92573d3
parentdf82ef2914639994149ae03a28031b7dd1deeb29 (diff)
downloaddrakx-backup-do-not-use-bc740bd9a6b1b8759c2aeeefde5eb0303445b61d.tar
drakx-backup-do-not-use-bc740bd9a6b1b8759c2aeeefde5eb0303445b61d.tar.gz
drakx-backup-do-not-use-bc740bd9a6b1b8759c2aeeefde5eb0303445b61d.tar.bz2
drakx-backup-do-not-use-bc740bd9a6b1b8759c2aeeefde5eb0303445b61d.tar.xz
drakx-backup-do-not-use-bc740bd9a6b1b8759c2aeeefde5eb0303445b61d.zip
moved com_license to parent package (as code that show the license is now
available even for non gtk install).
-rw-r--r--perl-install/install_steps_gtk.pm30
1 files changed, 1 insertions, 29 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index d08dea1de..a00fb8001 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -596,35 +596,7 @@ sub installPackages {
my $name = pkgs::mediumDescr($o->{packages}, $medium);
local $| = 1; print "\a";
my $time = time();
- my $r = $name !~ /Application/ || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX(_("
-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.
-")), [ __("Accept"), __("Refuse") ], "Accept") eq "Accept");
+ my $r = $name !~ /Application/ || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX($install_steps_interactive::com_license), [ __("Accept"), __("Refuse") ], "Accept") eq "Accept");
$r &&= $o->ask_okcancel('', _("Change your Cd-Rom!
Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.