From 9cf282df6af6b5ddc9f07f6bd002815aac2306c4 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Fri, 19 Jun 2009 14:05:32 +0000 Subject: $urpm->{fatal} expects 2 arguments --- urpm/cdrom.pm | 4 ++-- urpmf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/urpm/cdrom.pm b/urpm/cdrom.pm index b3bd91cf..94db0bb8 100644 --- a/urpm/cdrom.pm +++ b/urpm/cdrom.pm @@ -64,9 +64,9 @@ sub _try_mounting_cdrom_using_hal { $urpm->{cdrom_mounted} = {}; # reset - 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(); + eval { require Hal::Cdroms; 1 } or $urpm->{error}(10, N("You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)")), return(); - my $hal_cdroms = eval { Hal::Cdroms->new } or $urpm->{fatal}(N("HAL daemon (hald) is not running or not ready")); + my $hal_cdroms = eval { Hal::Cdroms->new } or $urpm->{fatal}(10, N("HAL daemon (hald) is not running or not ready")); foreach my $hal_path ($hal_cdroms->list) { my $mntpoint; diff --git a/urpmf b/urpmf index 31fb499d..b40ff2aa 100755 --- a/urpmf +++ b/urpmf @@ -332,7 +332,7 @@ if ($needed_media_info{hdlist}) { if (m!^{fatal}("fast algorithm is broken, please report a bug"); + $fn or $urpm->{fatal}(1, "fast algorithm is broken, please report a bug"); my $pkg = urpm::xml_info_pkg->new({ fn => $fn }); print $pkg->name, ':', $_; } -- cgit v1.2.1