From 580f495ce8cc4e4039c5aa4179564053b2d401c5 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 12 Oct 1999 16:37:16 +0000
Subject: *** empty log message ***

---
 perl-install/install2.pm      | 6 ++++--
 perl-install/install_steps.pm | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 9547d08c3..0639fd6a1 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -507,8 +507,10 @@ sub main {
 	    $o->kill_action;
 	    /^setstep (.*)/ and $o->{step} = $1, $clicked = 1, redo MAIN;
 	    /^theme_changed$/ and redo MAIN;
-	    eval { $o->errorInStep($_) } unless /^already displayed/;
-	    $@ and next;
+	    unless (/^already displayed/) {
+		eval { $o->errorInStep($_) };
+		$@ and next;
+	    }
 	    $o->{step} = $o->{steps}{$o->{step}}{onError};
 	    next MAIN unless $o->{steps}{$o->{step}}{reachable}; #- sanity check: avoid a step not reachable on error.
 	    redo MAIN;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 16835a196..8188fa87f 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -116,7 +116,9 @@ sub ask_mntpoint_s {
     (fsedit::get_root($fstab) || {})->{type} = 0x83;
 
     my %m; foreach (@$fstab) {
-	my $m = $_->{mntpoint} or next;
+	my $m = $_->{mntpoint};
+
+	next unless $m && $m ne 'swap'; #- there may be a lot of swap.
 
 	$m{$m} and die _("Duplicate mount point %s", $m);
 	$m{$m} = 1;
-- 
cgit v1.2.1