summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-15 23:26:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-15 23:26:20 +0000
commitb3a3c3b42039f3d5265bb1fd6af5cb8a88930327 (patch)
tree539a19100131b64d53d83b507cff7bc6800ec9c1
parente897879fac5c75701ca4feba108fc2334db5e3d2 (diff)
downloaddrakx-b3a3c3b42039f3d5265bb1fd6af5cb8a88930327.tar
drakx-b3a3c3b42039f3d5265bb1fd6af5cb8a88930327.tar.gz
drakx-b3a3c3b42039f3d5265bb1fd6af5cb8a88930327.tar.bz2
drakx-b3a3c3b42039f3d5265bb1fd6af5cb8a88930327.tar.xz
drakx-b3a3c3b42039f3d5265bb1fd6af5cb8a88930327.zip
(selectInstallClass): display mandrake release version when listing the choices of partitions to upgrade
-rw-r--r--perl-install/install_steps_interactive.pm16
1 files changed, 12 insertions, 4 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 8de24ec4a..d7d7acba0 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -129,18 +129,26 @@ sub selectInstallClass {
my ($o) = @_;
if (my @l = install_any::find_root_parts($o->{fstab}, $o->{prefix})) {
- log::l("proposing to upgrade partitions " . join(" ", map { $_->{device} } @l));
+ log::l("proposing to upgrade partitions " . join(" ", map { $_->{part}{device} } @l));
+
+ my @releases = uniq(map { $_->{release} } @l);
+ if (@release != @l) {
+ #- same release name so adding the device to differentiate them:
+ $_->{release} .= " ($_->{part}{device})" foreach @l;
+ }
+
my $p = $o->ask_from_listf(N("Install/Upgrade"),
N("Is this an install or an upgrade?"),
sub {
ref $_[0] ? (@l > 1 ?
- N("Upgrade partition %s", partition_table::description($_[0])) :
+ N("Upgrade %s", $_[0]{release}) :
N("Upgrade")) :
translate($_[0]);
}, [ @l, N_("Install") ]);
if (ref $p) {
- log::l("choosing to upgrade partition $p->{device}");
- install_any::use_root_part($o->{all_hds}, $p, $o->{prefix});
+ my $part = $p->{part};
+ log::l("choosing to upgrade partition $part->{device}");
+ install_any::use_root_part($o->{all_hds}, $part, $o->{prefix});
$o->{isUpgrade} = 1;
}
}