summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-01-05 13:20:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-01-05 13:20:13 +0000
commit139da3b3b9e267c546893f9b2955134eedfc648a (patch)
treedb5f4e7bd7168aa72583d9e045eaf4e0b2cf1d84 /perl-install
parent07a7424075429fcab14763850cba40fe8ad7a57b (diff)
downloaddrakx-backup-do-not-use-139da3b3b9e267c546893f9b2955134eedfc648a.tar
drakx-backup-do-not-use-139da3b3b9e267c546893f9b2955134eedfc648a.tar.gz
drakx-backup-do-not-use-139da3b3b9e267c546893f9b2955134eedfc648a.tar.bz2
drakx-backup-do-not-use-139da3b3b9e267c546893f9b2955134eedfc648a.tar.xz
drakx-backup-do-not-use-139da3b3b9e267c546893f9b2955134eedfc648a.zip
*** empty log message ***
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps_interactive.pm16
1 files changed, 5 insertions, 11 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 7b69d5c98..1759aab95 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -300,8 +300,8 @@ sub chooseGroups {
}
}
my $f = "$o->{prefix}/etc/sysconfig/desktop";
- output($f, "KDE\n") if $o->{compssUsersChoice}{KDE};
output($f, "GNOME\n") if $o->{compssUsersChoice}{Gnome};
+ output($f, "KDE\n") if $o->{compssUsersChoice}{KDE};
}
#------------------------------------------------------------------------------
@@ -506,17 +506,11 @@ 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.
-The present agreement shall be governed and construed pursuant to the laws of
-France except to the extent that the application of local laws is required by
-mandatory laws of public order. However this agreement expressly excludes any
-conflict of laws, principles, choice of law or rule to the contrary. Therefore
-French laws shall prevail on any other local laws.
-
For any queries relating to these agreement, please contact
-Mandrakesoft
-43, rue d'Aboukir
-75002 Paris
-FRANCE")) || return;
+Mandrakesoft, Inc.
+2400 N. Lincoln Avenue Suite 243
+Altadena California 91001
+USA")) || return;
require crypto;
eval {