From 074de8adaf6e0d910899b7ee0f14066dcc050af7 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 29 Jul 2002 12:39:59 +0000
Subject: ensure choosing install-or-upgrade can't be done twice (since it's
 badly handled and hard to handle nicely)

---
 perl-install/install2.pm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'perl-install/install2.pm')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 3fa29a897..0fd32cb32 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -40,7 +40,7 @@ $o = $::o = {
     partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0 }, #-, readonly => 0 },
     authentication => { md5 => 1, shadow => 1 },
     lang         => 'en_US',
-    isUpgrade    => 0,
+#-    isUpgrade    => 0,
     toRemove     => [],
     toSave       => [],
 #-    simple_themes => 1,
@@ -135,9 +135,6 @@ sub selectInstallClass {
 
     installStepsCall($o, $auto, 'selectInstallClass', $clicked);
 
-    if ($o->{steps}{choosePackages}{entered} >= 1 && !$o->{steps}{installPackages}{done}) {
-	installStepsCall($o, $auto, 'setPackages', $o->{isUpgrade} && $ent_number == 1);
-    }
     if ($o->{isUpgrade}) {
 	@{$o->{orderedSteps}} = map { /setupSCSI/ ? ($_, "doPartitionDisks") : $_ }
 	                        grep { !/doPartitionDisks/ } @{$o->{orderedSteps}};
-- 
cgit v1.2.1