From a4f0c119109814ed06004d62dc51c843e1110213 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 13 Feb 2009 17:09:19 +0000
Subject: (upgrade_kde3_to) split it out of setPackages()

---
 perl-install/install/any.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'perl-install/install')

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 {
-- 
cgit v1.2.1