summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-07-23 21:15:31 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-07-23 21:15:31 +0000
commit5a632fe532f355a2583970fefb2ed8ceec6c9460 (patch)
tree53c1ddbe41a4e8dad28ca4382794803ae177fbc2 /perl-install/install2.pm
parentbc25ea4a6ee8505a77972e2a723607735a4e19f9 (diff)
downloaddrakx-backup-do-not-use-5a632fe532f355a2583970fefb2ed8ceec6c9460.tar
drakx-backup-do-not-use-5a632fe532f355a2583970fefb2ed8ceec6c9460.tar.gz
drakx-backup-do-not-use-5a632fe532f355a2583970fefb2ed8ceec6c9460.tar.bz2
drakx-backup-do-not-use-5a632fe532f355a2583970fefb2ed8ceec6c9460.tar.xz
drakx-backup-do-not-use-5a632fe532f355a2583970fefb2ed8ceec6c9460.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 049331533..0ba4ae3b0 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -107,7 +107,7 @@ my $default = {
[ 0, __('Games') => qw(xbill xboard xboing xfishtank xgammon xjewel xpat2 xpilot xpuzzles xtrojka xkobo freeciv) ],
],
packages => [ qw() ],
- partitionning => { clearall => 0, eraseBadPartitions => 1, autoformat => 1 },
+ partitionning => { clearall => $::testing, eraseBadPartitions => 1, autoformat => 1 },
partitions => [
{ mntpoint => "/boot", size => 16 << 11, type => 0x83 },
{ mntpoint => "/", size => 300 << 11, type => 0x83 },
@@ -282,7 +282,8 @@ sub main {
for (my $step = $o->{steps}->{first}; $step ne 'done'; $step = getNextStep($step)) {
$o->enteringStep($step);
- &{$install2::{$step}}() and $o->{steps}->{$step}->{completed} = 1;
+ eval { &{$install2::{$step}}() };
+ $@ and $o->warn($@);
$o->leavingStep($step);
}
killCardServices();