From b67dc7c76815402dbd3c9b37200a5a1636f94d98 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Mon, 6 Apr 2009 10:17:40 +0000
Subject: put distro version after release because release contains "Mandriva
 Linux"

---
 perl-install/install/steps_interactive.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 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 aa2b42e1d..6e8d8a020 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -132,7 +132,7 @@ sub selectInstallClass {
 
 	log::l("proposing to upgrade partitions " . join(" ", map { $_->{part} && $_->{part}{device} } @l));
 
-	my @releases = uniq(map { "$_->{version} $_->{release}" } @l);
+	my @releases = uniq(map { "$_->{release} $_->{version}" } @l);
 	if (@releases != @l) {
 	    #- same release name so adding the device to differentiate them:
 	    $_->{release} .= " ($_->{part}{device})" foreach @l;
@@ -148,7 +148,7 @@ sub selectInstallClass {
                           { val => \$p,
 			  list => [ @l, N_("_: This is a noun:\nInstall") ], 
 			  type => 'list',
-			  format => sub { ref($_[0]) ? N("Upgrade %s", "$_[0]->{version} $_[0]->{release}") : translate($_[0]) }
+			  format => sub { ref($_[0]) ? N("Upgrade %s", "$_[0]->{release} $_[0]->{version}") : translate($_[0]) }
 			} ]);
 	if (ref $p) {
 	    _check_unsafe_upgrade_and_warn($o, $p->{part}) or $p = undef;
-- 
cgit v1.2.1