summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-29 20:33:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-29 20:33:20 +0000
commit667f6dc5830137b4cd9d9b4969960486213c2049 (patch)
tree84d080ba2cfe748868b8abb4a317fc534f258736
parent4bb92a5afc413774bbc1e94b70bb1064bb40666f (diff)
downloaddrakx-667f6dc5830137b4cd9d9b4969960486213c2049.tar
drakx-667f6dc5830137b4cd9d9b4969960486213c2049.tar.gz
drakx-667f6dc5830137b4cd9d9b4969960486213c2049.tar.bz2
drakx-667f6dc5830137b4cd9d9b4969960486213c2049.tar.xz
drakx-667f6dc5830137b4cd9d9b4969960486213c2049.zip
cleanup
-rw-r--r--perl-install/partition_table.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index b7ddb5cb5..4912f7fc3 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -735,10 +735,12 @@ sub add {
eval { add_primary($hd, $part) };
goto success if !$@;
}
- eval { add_extended($hd, $part, $primaryOrExtended) } if $hd->hasExtended; #- try adding extended
- if ($@ || !$hd->hasExtended) {
- eval { add_primary($hd, $part) };
- die $@ if $@; #- send the add extended error which should be better
+ if ($hd->hasExtended) {
+ eval { add_extended($hd, $part, $primaryOrExtended) };
+ goto success if !$@;
+ }
+ {
+ add_primary($hd, $part);
}
success:
assign_device_numbers($hd);