diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-10-01 16:45:21 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-10-01 16:45:21 +0000 |
| commit | dbe747e510ebee6cce7879401d0ac6c2bbc8566f (patch) | |
| tree | 09049c0abab57e3aefdb7e8784e9a68d048ba07e | |
| parent | e141e9b1e43be848586f83162f912ffd05927795 (diff) | |
| download | drakx-backup-do-not-use-dbe747e510ebee6cce7879401d0ac6c2bbc8566f.tar drakx-backup-do-not-use-dbe747e510ebee6cce7879401d0ac6c2bbc8566f.tar.gz drakx-backup-do-not-use-dbe747e510ebee6cce7879401d0ac6c2bbc8566f.tar.bz2 drakx-backup-do-not-use-dbe747e510ebee6cce7879401d0ac6c2bbc8566f.tar.xz drakx-backup-do-not-use-dbe747e510ebee6cce7879401d0ac6c2bbc8566f.zip | |
- when upgrading a kde3 box and task-kde3 is not on the CDs, propose to reboot
and upgrade through Mandriva update applet
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 19 |
2 files changed, 15 insertions, 6 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 1d2df64cd..1a5f050e2 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- when upgrading a kde3 box and task-kde3 is not on the CDs, propose to reboot + and upgrade through Mandriva update applet - add help button for media selection step - ensure proper centering of popped windows - fix/adjust some help pages (#42986) diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 83d60802a..840422d5d 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -159,12 +159,6 @@ sub selectInstallClass { _check_unsafe_upgrade_and_warn($o, $p->{part}) or $p = undef; } - my $_foo = 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'); - if (ref $p) { if ($p->{part}) { @@ -425,6 +419,19 @@ sub choosePackages { $o->ask_warn('', $msg); install::steps::rebootNeeded($o); } + if ($o->{isUpgrade} && -e "$::prefix/usr/bin/kded" + && !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); + } my ($individual, $chooseGroups); |