- move lock functions to a full blown module

- handle get_exclusive and release_exclusive on existing lock, 
  *but* don't use it for now! (not useful)
- remove urpmi_db locking from add_medium and update_media
- move rpm_db locking into _read_cachedir_pubkey
- update_media: restrict rpm_db exclusive locking to parse_pubkeys
- urpmi: move locking rpm_db near its use
- handle lock directly in urpmi.addmedia, urpmi.update, urpme, urpmf
- log locking/unlocking

1 files changed, 5 insertions, 7 deletions

diff --git a/urpmi b/urpmi
index 767de487..4e66aaf4 100755
--- a/urpmi
+++ b/urpmi
@@ -334,11 +334,7 @@ if (exists $urpm->{options}{'priority-upgrade'} && $urpm->{options}{'priority-up
     unlink glob('/var/lib/rpm/__db.*') unless $root;
 }
 
-my ($rpm_lock, $urpmi_lock);
-unless ($env || $nolock) {
-    $rpm_lock = urpm::sys::lock_rpm_db($urpm, 'exclusive');
-    $urpmi_lock = urpm::sys::lock_urpmi_db($urpm);
-}
+my $urpmi_lock = !$env && !$nolock && urpm::lock::urpmi_db($urpm);
 
 #- should we ignore arch compatibility
 if ($urpm->{options}{ignorearch}) { urpm::shunt_ignorearch() }
@@ -402,6 +398,8 @@ if ($bug) {
     urpm::bug_report::copy_requested($urpm, $bug, \%requested);
 }
 
+my $rpm_lock = !$env && !$nolock && urpm::lock::rpm_db($urpm, 'exclusive');
+
 #- search the packages according to the selection given by the user.
 my $search_result;
 if (@names) {
@@ -826,8 +824,8 @@ if ($nok) {
 }
 
 unless ($env || $nolock) {
-    urpm::sys::unlock($urpmi_lock);
-    urpm::sys::unlock($rpm_lock);
+    $urpmi_lock->unlock;
+    $rpm_lock->unlock;
 
     #- try to umount removable device which may have been mounted.
     urpm::removable::try_umounting_removables($urpm);