summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-15 16:19:35 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-15 16:19:35 +0000
commitc4371178d66a06424463739c737af6b488153bf8 (patch)
treee6af94372336e6eb6bec595bf056629c99482ea1
parent0c2bd76964a9fa114030646f9edd90616b139c84 (diff)
downloadurpmi-c4371178d66a06424463739c737af6b488153bf8.tar
urpmi-c4371178d66a06424463739c737af6b488153bf8.tar.gz
urpmi-c4371178d66a06424463739c737af6b488153bf8.tar.bz2
urpmi-c4371178d66a06424463739c737af6b488153bf8.tar.xz
urpmi-c4371178d66a06424463739c737af6b488153bf8.zip
fix calls to {fatal}
-rw-r--r--urpm.pm4
-rw-r--r--urpm/lock.pm4
2 files changed, 4 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index 250a9204..631f6c93 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -105,8 +105,8 @@ sub userdir {
my $dir = ($urpm->{urpmi_root} || '') . userdir_prefix($urpm) . $<;
mkdir $dir, 0755; # try to create it
- -d $dir && ! -l $dir or $urpm->{fatal}(N("fail to create directory %s", $dir));
- -o $dir && -w $dir or $urpm->{fatal}(N("invalid owner for directory %s", $dir));
+ -d $dir && ! -l $dir or $urpm->{fatal}(1, N("fail to create directory %s", $dir));
+ -o $dir && -w $dir or $urpm->{fatal}(1, N("invalid owner for directory %s", $dir));
$dir;
}
diff --git a/urpm/lock.pm b/urpm/lock.pm
index ea59a983..aeb0aa3b 100644
--- a/urpm/lock.pm
+++ b/urpm/lock.pm
@@ -60,9 +60,9 @@ sub _lock {
if (!flock($lock->{fh}, $mode | $LOCK_NB)) {
if ($b_wait) {
$lock->{info}(N("%s database locked. waiting...", $lock->{db_name}));
- flock($lock->{fh}, $mode) or $lock->{fatal}(N("aborting"));
+ flock($lock->{fh}, $mode) or $lock->{fatal}(1, N("aborting"));
} else {
- $lock->{fatal}(N("%s database locked", $lock->{db_name}));
+ $lock->{fatal}(1, N("%s database locked", $lock->{db_name}));
}
}
$lock->{locked} = 1;