summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-06-19 14:05:32 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-06-19 14:05:32 +0000
commit9cf282df6af6b5ddc9f07f6bd002815aac2306c4 (patch)
tree5fbe8867bed99b4843a8c0b9e97eaf4a7213c5c3
parent4cc76b752b5d41dc764cf718058aa19d9a93dd3c (diff)
downloadurpmi-9cf282df6af6b5ddc9f07f6bd002815aac2306c4.tar
urpmi-9cf282df6af6b5ddc9f07f6bd002815aac2306c4.tar.gz
urpmi-9cf282df6af6b5ddc9f07f6bd002815aac2306c4.tar.bz2
urpmi-9cf282df6af6b5ddc9f07f6bd002815aac2306c4.tar.xz
urpmi-9cf282df6af6b5ddc9f07f6bd002815aac2306c4.zip
$urpm->{fatal} expects 2 arguments
-rw-r--r--urpm/cdrom.pm4
-rwxr-xr-xurpmf2
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!^<!) {
($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, ':', $_;
}