diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-04-23 17:27:44 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-04-23 17:27:44 +0000 |
| commit | 8132dc614538b96f9a3eed4df85b529c2cb11276 (patch) | |
| tree | 0009d6274575b19f04c559191140c4a5f2cb45bc | |
| parent | 35efb3c99146733c74f1f1cf5561e2c9e053d2fd (diff) | |
| download | drakx-8132dc614538b96f9a3eed4df85b529c2cb11276.tar drakx-8132dc614538b96f9a3eed4df85b529c2cb11276.tar.gz drakx-8132dc614538b96f9a3eed4df85b529c2cb11276.tar.bz2 drakx-8132dc614538b96f9a3eed4df85b529c2cb11276.tar.xz drakx-8132dc614538b96f9a3eed4df85b529c2cb11276.zip | |
(setPackages) drop old KDE3 to KDE4 migration path
since no supported distro offers KDE3
| -rw-r--r-- | perl-install/install/any.pm | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index fbdc1b3b3..03d8654b1 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -374,7 +374,6 @@ sub setPackages { log::l("selecting task-kde (since kdebase-progs was installed)"); install::pkgs::select_by_package_names($o->{packages}, ['task-kde']); } - upgrade_kde3_to_kde4($o); } } @@ -400,16 +399,6 @@ sub remove_package_for_upgrade { log::l("Removing packages took: ", formatTimeRaw(time() - $time)); } -sub upgrade_kde3_to_kde4 { - my ($o) = @_; - 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"); - install::pkgs::select_by_package_names($o->{packages}, ['task-kde4']); - } -} - sub count_files { my ($dir) = @_; -d $dir or return 0; |