summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-03-11 10:23:53 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-03-11 10:23:53 +0000
commit8d0b99a0e5e9a142aa90fcbff45cecc2464c5da9 (patch)
tree4f03dd8caaa7cbd90f8890006393def4dbe39ac5
parent87f2e8cf32914530d089b75b00366bd95aafb1df (diff)
downloaddrakx-backup-do-not-use-8d0b99a0e5e9a142aa90fcbff45cecc2464c5da9.tar
drakx-backup-do-not-use-8d0b99a0e5e9a142aa90fcbff45cecc2464c5da9.tar.gz
drakx-backup-do-not-use-8d0b99a0e5e9a142aa90fcbff45cecc2464c5da9.tar.bz2
drakx-backup-do-not-use-8d0b99a0e5e9a142aa90fcbff45cecc2464c5da9.tar.xz
drakx-backup-do-not-use-8d0b99a0e5e9a142aa90fcbff45cecc2464c5da9.zip
search /commercial/i instead of /Application/ before showing the commercial license
-rw-r--r--perl-install/install_steps_gtk.pm2
-rw-r--r--perl-install/install_steps_interactive.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 294c6ea0a..bca6ed4c1 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -653,7 +653,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($install_steps_interactive::com_license), [ __("Accept"), __("Refuse") ], "Accept") eq "Accept");
+ my $r = $name !~ /commercial/i || ($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.
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 1152ad772..10d36d09a 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -808,7 +808,7 @@ sub installPackages {
$method eq 'cdrom' && !$::oem and do {
my $name = pkgs::mediumDescr($o->{packages}, $medium);
local $| = 1; print "\a";
- my $r = $name !~ /Application/ || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX($com_license), [ __("Accept"), __("Refuse") ], "Accept") eq "Accept");
+ my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX($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.