summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-02-13 17:09:19 +0000
committerThierry Vignaud <tv@mandriva.org>2009-02-13 17:09:19 +0000
commita4f0c119109814ed06004d62dc51c843e1110213 (patch)
tree5dfda53dcf07104d89e53c430d10773ec5e68650 /perl-install
parent4322ca1da805315413ce1f47efe1280300c5cceb (diff)
downloaddrakx-a4f0c119109814ed06004d62dc51c843e1110213.tar
drakx-a4f0c119109814ed06004d62dc51c843e1110213.tar.gz
drakx-a4f0c119109814ed06004d62dc51c843e1110213.tar.bz2
drakx-a4f0c119109814ed06004d62dc51c843e1110213.tar.xz
drakx-a4f0c119109814ed06004d62dc51c843e1110213.zip
(upgrade_kde3_to) split it out of setPackages()
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/any.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 8c33e6231..405d09d74 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -104,6 +104,7 @@ sub preConfigureTimezone {
sub ask_suppl_media_method {
my ($o) = @_;
our $suppl_already_asked;
+ #TVreturn;
my $msg = $suppl_already_asked
? N("Do you have further supplementary media?")
@@ -381,6 +382,12 @@ 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);
+ }
+}
+
+sub upgrade_kde3_to_kde4 {
+ my ($o) = @_;
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");
@@ -396,7 +403,6 @@ please reboot your system and upgrade using the Mandriva update applet.", 'Mandr
log::l("ok, continuing anyway, but forcing install of task-kde4");
install::pkgs::select_by_package_names($o->{packages}, ['task-kde4']);
}
- }
}
sub count_files {