diff options
author | Christophe Fergeau <cfergeau@mandriva.com> | 2009-06-05 14:51:02 +0000 |
---|---|---|
committer | Christophe Fergeau <cfergeau@mandriva.com> | 2009-06-05 14:51:02 +0000 |
commit | a27be09e5345f0be3fbe7cf2570c087d4a92cd32 (patch) | |
tree | ed7724ae3132fc00b7d29dec2df64cbbd80dc26c | |
parent | 494e132262dc7c0a161b4e3df5765f293d483574 (diff) | |
download | urpmi-a27be09e5345f0be3fbe7cf2570c087d4a92cd32.tar urpmi-a27be09e5345f0be3fbe7cf2570c087d4a92cd32.tar.gz urpmi-a27be09e5345f0be3fbe7cf2570c087d4a92cd32.tar.bz2 urpmi-a27be09e5345f0be3fbe7cf2570c087d4a92cd32.tar.xz urpmi-a27be09e5345f0be3fbe7cf2570c087d4a92cd32.zip |
$urpm->{fatal} expects 2 arguments
-rw-r--r-- | urpm/cdrom.pm | 4 | ||||
-rwxr-xr-x | 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; @@ -332,7 +332,7 @@ if ($needed_media_info{hdlist}) { if (m!^<!) { ($fn) = /fn="(.*)"/; } elsif (%s) { - $fn or $urpm->{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, ':', $_; } |