summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-20 00:41:57 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-20 00:41:57 +0000
commitc20f634253246a3ddaaeb890a67f2d44df54e76e (patch)
treebcb85a68138e13dfb87b6ec1af793d51279b6874
parent10c94181d1c42466be315456f5abc5fe3ee2693b (diff)
downloaddraklive-install-c20f634253246a3ddaaeb890a67f2d44df54e76e.tar
draklive-install-c20f634253246a3ddaaeb890a67f2d44df54e76e.tar.gz
draklive-install-c20f634253246a3ddaaeb890a67f2d44df54e76e.tar.bz2
draklive-install-c20f634253246a3ddaaeb890a67f2d44df54e76e.tar.xz
draklive-install-c20f634253246a3ddaaeb890a67f2d44df54e76e.zip
do not loop if ask_partitions succeeds
-rwxr-xr-xdraklive-install7
1 files changed, 3 insertions, 4 deletions
diff --git a/draklive-install b/draklive-install
index fa2780d..c5f55a2 100755
--- a/draklive-install
+++ b/draklive-install
@@ -115,10 +115,9 @@ sub ask_partitions_loop {
while (1) {
eval { ask_partitions($in, $all_hds, $fstab) };
- if (my $err = $@) {
- $in->exit(1) if $err =~ /wizcancel/ ||
- !$in->ask_warn(N("Error"), N("An error occured: %s", $err))
- }
+ my $err = $@ or last;
+ $in->exit(1) if $err =~ /wizcancel/ ||
+ !$in->ask_warn(N("Error"), N("An error occured: %s", $err));
}
}