move code

2 files changed, 13 insertions, 13 deletions

diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 9ad757da3..6008ab2b8 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -381,6 +381,19 @@ sub setPackages {
 	    log::l("selecting task-kde (since kdebase-progs was installed)");
 	    install::pkgs::select_by_package_names($o->{packages}, ['task-kde']);
 	}
+	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");
+
+	    my $choice;
+	    $o->ask_from_({ messages => formatAlaTeX(N("You have decided to upgrade your system to %s. KDE 3.5 has been detected
+on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you choose to proceed, 
+KDE 4 will replace KDE 3, and you will lose your personal KDE configuration settings. 
+To upgrade with KDE 3.5 and your personal settings preserved, 
+please reboot your system and upgrade using the Mandriva update applet.", 'Mandriva Linux 2009')) },
+			  [ { val => \$choice, type => 'list', list => [ N_("Reboot"), N_("Proceed") ], format => \&translate } ]);
+	    $choice eq 'Reboot' and install::steps::rebootNeeded($o);	
+	}
     }
 }
 
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 17b24382b..166fca1a2 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -419,19 +419,6 @@ sub choosePackages {
 	$o->ask_warn('', $msg);
 	install::steps::rebootNeeded($o);
     }
-    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");
-
-	my $choice;
-	$o->ask_from_({ messages => formatAlaTeX(N("You have decided to upgrade your system to %s. KDE 3.5 has been detected
-on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you choose to proceed, 
-KDE 4 will replace KDE 3, and you will lose your personal KDE configuration settings. 
-To upgrade with KDE 3.5 and your personal settings preserved, 
-please reboot your system and upgrade using the Mandriva update applet.", 'Mandriva Linux 2009')) },
-				   [ { val => \$choice, type => 'list', list => [ N_("Reboot"), N_("Proceed") ], format => \&translate } ]);
-	$choice eq 'Reboot' and install::steps::rebootNeeded($o);	
-    }
 
     my ($individual, $chooseGroups);