diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-25 11:41:29 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-25 11:41:29 +0000 |
| commit | c072726285dbf4a636fef8667067fd0e4a2ecde5 (patch) | |
| tree | 577e69ac4e5beb6f22f97ea18108c005cf2ea4ba | |
| parent | 59fcf6029bf999f78d1ddc0bd7788ade4961fb4c (diff) | |
| download | drakx-c072726285dbf4a636fef8667067fd0e4a2ecde5.tar drakx-c072726285dbf4a636fef8667067fd0e4a2ecde5.tar.gz drakx-c072726285dbf4a636fef8667067fd0e4a2ecde5.tar.bz2 drakx-c072726285dbf4a636fef8667067fd0e4a2ecde5.tar.xz drakx-c072726285dbf4a636fef8667067fd0e4a2ecde5.zip | |
- don't crash install when mounting CD fails (#33421)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index b2a28e0bf..e6479bc09 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- don't crash install when mounting CD fails (#33421) + Version 10.4.211 - 24 September 2007, by Pascal "Pixel" Rigaux - on upgrade, don't add resume=xxx if noresume is there (#33953) diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index a7ca657c1..b02f066e8 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -329,7 +329,7 @@ sub ask_change_cd_ { Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done. If you do not have it, press Cancel to avoid installation from this Cd-Rom.", $phys_m->{name}), 1) or return; - fs::mount::part($phys_m); + eval { fs::mount::part($phys_m) }; #- it can be a directory, so don't use -f !$o_rel_file || -e install::media::path($phys_m, $o_rel_file) and return 1; |