diff options
author | Olivier Blin <oblin@mandriva.com> | 2008-04-03 05:23:24 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2008-04-03 05:23:24 +0000 |
commit | e4ec3f1db86963391b03d75723d82226ab49705e (patch) | |
tree | 29a23c80c72e229af116d3a379ae5067b8ba35bf | |
parent | f7f15a67c0e395836a8dee216e27a4cd0108ed61 (diff) | |
download | draklive-install-e4ec3f1db86963391b03d75723d82226ab49705e.tar draklive-install-e4ec3f1db86963391b03d75723d82226ab49705e.tar.gz draklive-install-e4ec3f1db86963391b03d75723d82226ab49705e.tar.bz2 draklive-install-e4ec3f1db86963391b03d75723d82226ab49705e.tar.xz draklive-install-e4ec3f1db86963391b03d75723d82226ab49705e.zip |
do not crash when no valid devices is found (#36377)
-rwxr-xr-x | draklive-install | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/draklive-install b/draklive-install index 53d89c4..dcdbe8b 100755 --- a/draklive-install +++ b/draklive-install @@ -113,10 +113,16 @@ sub umount_first_pass() { sub init_hds { my ($in, $all_hds, $fstab) = @_; - my $_wait = $in->wait_message('', N("Please wait")); + my $wait = $in->wait_message('', N("Please wait")); umount_first_pass(); - fs::any::get_hds($all_hds, $fstab, [], {}, 'skip_mtab', $in); + eval { fs::any::get_hds($all_hds, $fstab, [], {}, 'skip_mtab', $in) }; + my $err = $@; umount_all($fstab); + if ($err) { + undef $wait; + $in->ask_warn(N("Error"), [ formatError($err) ]); + $in->exit(1); + } } sub ask_partitions_loop { |