summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--urpm/lock.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 74f1f11b..c84d8dff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- urpmi
+ o fix rpmdb locking with --root
+
Version 4.10.6 - 28 August 2007, by Pascal "Pixel" Rigaux
- urpmi
diff --git a/urpm/lock.pm b/urpm/lock.pm
index dbd237ba..ea59a983 100644
--- a/urpm/lock.pm
+++ b/urpm/lock.pm
@@ -18,7 +18,7 @@ my ($LOCK_SH, $LOCK_EX, $LOCK_NB, $LOCK_UN) = (1, 2, 4, 8);
# (options: nofatal, wait)
sub rpm_db {
my ($urpm, $b_exclusive, %options) = @_;
- my $f = ($urpm->{root} && !$urpm->{urpmi_root} ? "$urpm->{root}/" : '') . "$urpm->{statedir}/.RPMLOCK";
+ my $f = ($urpm->{root} ? "$urpm->{root}/" : '') . "/var/lib/rpm/.RPMLOCK";
urpm::lock->new($urpm, $f, 'rpm', $b_exclusive, %options);
}
# (options: nofatal, wait)