From 1367515e40cd6cc9739001e331ad43a4e75fb4a2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 25 Mar 2008 15:34:47 +0000
Subject: - urpmi:   o nice error message when hal daemon is not running and is
 needed (#39327)

---
 NEWS          | 3 +++
 urpm/cdrom.pm | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index f2da4b5f..4c81627b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- urpmi:
+  o nice error message when hal daemon is not running and is needed (#39327)
+
 Version 5.16 - 25 March 2008, by Pascal "Pixel" Rigaux
 
 - urpmi:
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)) {
-- 
cgit v1.2.1