summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-04-06 10:17:40 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-04-06 10:17:40 +0000
commitb67dc7c76815402dbd3c9b37200a5a1636f94d98 (patch)
treecd19c7cdd03e10b290cf58b84eb4191ed251bf4a
parentc14c85c426e8460d0d5d7a1e33700bb4d777a1c6 (diff)
downloaddrakx-b67dc7c76815402dbd3c9b37200a5a1636f94d98.tar
drakx-b67dc7c76815402dbd3c9b37200a5a1636f94d98.tar.gz
drakx-b67dc7c76815402dbd3c9b37200a5a1636f94d98.tar.bz2
drakx-b67dc7c76815402dbd3c9b37200a5a1636f94d98.tar.xz
drakx-b67dc7c76815402dbd3c9b37200a5a1636f94d98.zip
put distro version after release because release contains "Mandriva Linux"
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm4
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 67e44bc00..84fa65790 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- put distro version after release because release contains "Mandriva Linux"
+
Version 12.24.1 - 05 April 2009
- ensure login is lowercase when transliterating from real name
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;