diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-08-29 14:28:10 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-08-29 14:28:10 +0000 |
| commit | aa12bda21e9f895a0103c5e2d6cf67cb5c588db0 (patch) | |
| tree | 21e618798cae71896a985bc96c8c0db1e7a3ab62 | |
| parent | 7658320581abb96b0d6ccf5eccba94de95b59534 (diff) | |
| download | urpmi-aa12bda21e9f895a0103c5e2d6cf67cb5c588db0.tar urpmi-aa12bda21e9f895a0103c5e2d6cf67cb5c588db0.tar.gz urpmi-aa12bda21e9f895a0103c5e2d6cf67cb5c588db0.tar.bz2 urpmi-aa12bda21e9f895a0103c5e2d6cf67cb5c588db0.tar.xz urpmi-aa12bda21e9f895a0103c5e2d6cf67cb5c588db0.zip | |
(rpm_db) lock rpmdb in /var/lib/rpm rather than in /var/lib/urpmi thus fixing locking with --root
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | urpm/lock.pm | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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) |