diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-04-21 12:53:11 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-04-21 12:53:11 +0000 |
| commit | 6fba88fda680358f99b31ba221fad5f719c1a33c (patch) | |
| tree | 9da99f5e408113344d93aab9a962a95dd6817ada | |
| parent | c29dd9dec005570550def3307b9233d454b604e5 (diff) | |
| download | drakx-6fba88fda680358f99b31ba221fad5f719c1a33c.tar drakx-6fba88fda680358f99b31ba221fad5f719c1a33c.tar.gz drakx-6fba88fda680358f99b31ba221fad5f719c1a33c.tar.bz2 drakx-6fba88fda680358f99b31ba221fad5f719c1a33c.tar.xz drakx-6fba88fda680358f99b31ba221fad5f719c1a33c.zip | |
(upgrade_kde3_to_kde4) fix checking for kde3 (which is now in /opt)
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index d4e310a4d..c7534950e 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - do not offer to stop the install when kde3 is installed since kde3 to kde4 upgrade is now done +- fix checking for kde3 (which is now in /opt) - 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 abb9dc8b7..4d925cc91 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -400,7 +400,7 @@ sub remove_package_for_upgrade { sub upgrade_kde3_to_kde4 { my ($o) = @_; - if (-e "$::prefix/usr/bin/kicker" + if ((-e "$::prefix/usr/bin/kicker" || -e "$::prefix/opt/kde3/bin/kicker") && !install::pkgs::packageByName($o->{packages}, 'task-kde3')) { log::l("kde3 installed, but task-kde3 not available so can't upgrade correctly"); log::l("ok, continuing anyway, but forcing install of task-kde4"); |