summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-29 12:39:59 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-29 12:39:59 +0000
commit074de8adaf6e0d910899b7ee0f14066dcc050af7 (patch)
tree1b951142b3f0fe8d6231dd5c56af111261c5a214 /perl-install/install2.pm
parentbbd54ab4ee665a9afdf8642aa767bdbd608131c6 (diff)
downloaddrakx-074de8adaf6e0d910899b7ee0f14066dcc050af7.tar
drakx-074de8adaf6e0d910899b7ee0f14066dcc050af7.tar.gz
drakx-074de8adaf6e0d910899b7ee0f14066dcc050af7.tar.bz2
drakx-074de8adaf6e0d910899b7ee0f14066dcc050af7.tar.xz
drakx-074de8adaf6e0d910899b7ee0f14066dcc050af7.zip
ensure choosing install-or-upgrade can't be done twice
(since it's badly handled and hard to handle nicely)
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm5
1 files changed, 1 insertions, 4 deletions
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}};