From fd8bbba2f02b8bccd69e67c326fd320c0827941d Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Sun, 6 Feb 2011 22:37:08 +0000 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Mageia. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line Add drakx structure on the SVN ------------------------------------------------------------------------ r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned advertising ------------------------------------------------------------------------ r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line Import Clean perl-install ------------------------------------------------------------------------ r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line Add cleaned files ------------------------------------------------------------------------ r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned kernel ------------------------------------------------------------------------ r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned tools ------------------------------------------------------------------------ r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line Import stage1 ------------------------------------------------------------------------ r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line Import images ------------------------------------------------------------------------ r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines readd missing file ------------------------------------------------------------------------ r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line Import rescue ------------------------------------------------------------------------ r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines import cleaned rescue for Mageia ------------------------------------------------------------------------ r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line import (cleaned) doc ------------------------------------------------------------------------ --- perl-install/install/steps_interactive.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'perl-install/install/steps_interactive.pm') 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"); -- cgit v1.2.1