diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-10-02 15:08:57 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-10-02 15:08:57 +0000 |
| commit | 65c2f01be328a54210359e48076705113c25e26a (patch) | |
| tree | 878588e5d79aaae131a62a207a7d7d014aef3698 | |
| parent | d1e5467c850c302b0620dbc0882a2fcc81aad3dd (diff) | |
| download | drakx-backup-do-not-use-65c2f01be328a54210359e48076705113c25e26a.tar drakx-backup-do-not-use-65c2f01be328a54210359e48076705113c25e26a.tar.gz drakx-backup-do-not-use-65c2f01be328a54210359e48076705113c25e26a.tar.bz2 drakx-backup-do-not-use-65c2f01be328a54210359e48076705113c25e26a.tar.xz drakx-backup-do-not-use-65c2f01be328a54210359e48076705113c25e26a.zip | |
when testing wether kde3 is installed, check for /usr/bin/kicker instead of
/usr/bin/kded (we want to test wether kde3 "desktop" is installed, not wether
a kde3 application is installed)
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index e1639a828..17b24382b 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -419,7 +419,7 @@ sub choosePackages { $o->ask_warn('', $msg); install::steps::rebootNeeded($o); } - if ($o->{isUpgrade} && -e "$::prefix/usr/bin/kded" + if ($o->{isUpgrade} && -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"); |