diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-25 15:34:47 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-25 15:34:47 +0000 |
| commit | 1367515e40cd6cc9739001e331ad43a4e75fb4a2 (patch) | |
| tree | 05a835c52d4c50ef6ab20a05ae9809bad9ab7eaf /urpm/cdrom.pm | |
| parent | 0b75cf6149867bcca2bbc7c51fdcb7a4a8fd9dc0 (diff) | |
| download | urpmi-1367515e40cd6cc9739001e331ad43a4e75fb4a2.tar urpmi-1367515e40cd6cc9739001e331ad43a4e75fb4a2.tar.gz urpmi-1367515e40cd6cc9739001e331ad43a4e75fb4a2.tar.bz2 urpmi-1367515e40cd6cc9739001e331ad43a4e75fb4a2.tar.xz urpmi-1367515e40cd6cc9739001e331ad43a4e75fb4a2.zip | |
- urpmi:
o nice error message when hal daemon is not running and is needed (#39327)
Diffstat (limited to 'urpm/cdrom.pm')
| -rw-r--r-- | urpm/cdrom.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/urpm/cdrom.pm b/urpm/cdrom.pm index 55e26671..c09c55a2 100644 --- a/urpm/cdrom.pm +++ b/urpm/cdrom.pm @@ -65,7 +65,8 @@ sub _try_mounting_cdrom_using_hal { eval { require Hal::Cdroms; 1 } or $urpm->{error}(N("You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)")), return(); - my $hal_cdroms = Hal::Cdroms->new; + my $hal_cdroms = eval { Hal::Cdroms->new } or $urpm->{fatal}(N("HAL daemon (hald) is not running or not ready")); + foreach my $hal_path ($hal_cdroms->list) { my $mntpoint; if ($mntpoint = $hal_cdroms->get_mount_point($hal_path)) { |