summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-21 12:47:04 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-21 12:47:04 +0000
commitc29dd9dec005570550def3307b9233d454b604e5 (patch)
treee462ced94d44a6f55cb11891d78be38304b10cad
parent57c79a206dace7a3225467b26e193047ca5632d7 (diff)
downloaddrakx-c29dd9dec005570550def3307b9233d454b604e5.tar
drakx-c29dd9dec005570550def3307b9233d454b604e5.tar.gz
drakx-c29dd9dec005570550def3307b9233d454b604e5.tar.bz2
drakx-c29dd9dec005570550def3307b9233d454b604e5.tar.xz
drakx-c29dd9dec005570550def3307b9233d454b604e5.zip
(upgrade_kde3_to_kde4) do not offer to stop the install when kde3 is
installed since kde3 to kde4 upgrade is now done through kde4 packages obsoleting kde3 ones just silently select task-kde4
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/any.pm9
2 files changed, 2 insertions, 9 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a0b65fe94..d4e310a4d 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- do not offer to stop the install when kde3 is installed since kde3
+ to kde4 upgrade is now done
- diskdrake:
o display a progress bar while formating an ext4 partition
o do not run udevadm in install mode
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 90c63fc23..abb9dc8b7 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -403,15 +403,6 @@ sub upgrade_kde3_to_kde4 {
if (-e "$::prefix/usr/bin/kicker"
&& !install::pkgs::packageByName($o->{packages}, 'task-kde3')) {
log::l("kde3 installed, but task-kde3 not available so can't upgrade correctly");
-
- my $choice;
- $o->ask_from_({ messages => formatAlaTeX(N("You have decided to upgrade your system to %s. KDE 3.5 has been detected
-on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you choose to proceed,
-KDE 4 will replace KDE 3, and you will lose your personal KDE configuration settings.
-To upgrade with KDE 3.5 and your personal settings preserved,
-please reboot your system and upgrade using the Mandriva update applet.", 'Mandriva Linux 2009')) },
- [ { val => \$choice, type => 'list', list => [ N_("Reboot"), N_("Proceed") ], format => \&translate } ]);
- $choice eq 'Reboot' and install::steps::rebootNeeded($o);
log::l("ok, continuing anyway, but forcing install of task-kde4");
install::pkgs::select_by_package_names($o->{packages}, ['task-kde4']);
}