summaryrefslogtreecommitdiffstats
path: root/perl-install/install/steps_interactive.pm
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/install/steps_interactive.pm')
-rw-r--r--perl-install/install/steps_interactive.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 44bec8571..a0605e2c5 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -1,4 +1,4 @@
-package install::steps_interactive; # $Id$
+package install::steps_interactive; # $Id: steps_interactive.pm 267011 2010-03-19 12:00:12Z pterjan $
use strict;
@@ -174,7 +174,7 @@ sub selectInstallClass {
}
$o->{previous_release} = $p;
- $o->{isUpgrade} = (find { $p->{release_file} =~ /$_/ } 'mandriva', 'mandrake', 'conectiva', 'redhat') || 'unknown';
+ $o->{isUpgrade} = (find { $p->{release_file} =~ /$_/ } 'mageia', 'mandriva', 'mandrake', 'conectiva', 'redhat') || 'unknown';
$o->{upgrade_by_removing_pkgs_matching} ||= {
conectiva => 'cl',
redhat => '.', #- everything!
@@ -208,13 +208,13 @@ sub _warn_unsafe_upgrade {
);
my $choice;
- $o->ask_from_({ messages => N("Installer has detected that your installed Mandriva Linux system could not
+ $o->ask_from_({ messages => N("Installer has detected that your installed Linux system could not
safely be upgraded to %s.
New installation replacing your previous one is recommended.
Warning : you should backup all your personal data before choosing \"New
-Installation\".", 'Mandriva Linux 2009') },
+Installation\".", '%s') },
[ { val => \$choice, type => 'list', list => \@choices, format => \&translate } ]);
log::l("_warn_unsafe_upgrade: got $choice");