summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-03-31 09:16:58 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-03-31 09:16:58 +0000
commite5300a2a2d6defa24d3476ee005badb5d44f3155 (patch)
treee7a7a051efda3398adf767dffbae871e5558d75a /perl-install/install
parent3b4006b06c2cbbe24082ead5cdcae4f232c210fd (diff)
downloaddrakx-e5300a2a2d6defa24d3476ee005badb5d44f3155.tar
drakx-e5300a2a2d6defa24d3476ee005badb5d44f3155.tar.gz
drakx-e5300a2a2d6defa24d3476ee005badb5d44f3155.tar.bz2
drakx-e5300a2a2d6defa24d3476ee005badb5d44f3155.tar.xz
drakx-e5300a2a2d6defa24d3476ee005badb5d44f3155.zip
display the version of the distro in the install/upgrade screen (#44602)
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/steps_interactive.pm4
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 018075ee4..4d0080fe3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -3,8 +3,9 @@
- make button name match text when inserting a CD ("cancel" rather
than "previous")
- rotate /root/drakx/install1.log too
-- don't list installed distros with other archs as ugrading between
+- don't list installed distros with other archs as upgrading between
archs is not supported
+- display the version of the distro in the install/upgrade screen (#44602)
Version 12.21 - 30 March 2009
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index fff933b8d..baeb05415 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -131,7 +131,7 @@ sub selectInstallClass {
log::l("proposing to upgrade partitions " . join(" ", map { $_->{part} && $_->{part}{device} } @l));
- my @releases = uniq(map { $_->{release} } @l);
+ my @releases = uniq(map { "$_->{version} $_->{release}" } @l);
if (@releases != @l) {
#- same release name so adding the device to differentiate them:
$_->{release} .= " ($_->{part}{device})" foreach @l;
@@ -147,7 +147,7 @@ sub selectInstallClass {
{ val => \$p,
list => [ @l, N_("_: This is a noun:\nInstall") ],
type => 'list',
- format => sub { ref($_[0]) ? N("Upgrade %s", $_[0]{release}) : translate($_[0]) }
+ format => sub { ref($_[0]) ? N("Upgrade %s", "$_[0]->{version} $_[0]->{release}") : translate($_[0]) }
} ]);
if (ref $p) {
_check_unsafe_upgrade_and_warn($o, $p->{part}) or $p = undef;