From 6aed7e5429cab61514fe2eb3cacad3d11462cd5f Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 23 Nov 2006 10:49:51 +0000 Subject: - 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 --- urpmq | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'urpmq') diff --git a/urpmq b/urpmq index f4b4c78d..c8aeffd9 100755 --- a/urpmq +++ b/urpmq @@ -140,8 +140,8 @@ if ($urpm::args::options{ignorearch}) { urpm::shunt_ignorearch() } my $rpm_lock = $urpm::args::options{upgrade} && !$urpm::args::options{env} && !$urpm::args::options{nolock} - && urpm::sys::lock_rpm_db($urpm); -my $urpmi_lock = !$urpm::args::options{nolock} && urpm::sys::lock_urpmi_db($urpm); + && urpm::lock::rpm_db($urpm); +my $urpmi_lock = !$urpm::args::options{nolock} && urpm::lock::urpmi_db($urpm); urpm::media::configure($urpm, nocheck_access => 1, nodepslist => $urpm::args::options{nodepslist}, @@ -428,8 +428,8 @@ if ($urpm::args::options{list_aliases}) { exit 0; } } -$urpmi_lock and urpm::sys::unlock($urpmi_lock); -$rpm_lock and urpm::sys::unlock($rpm_lock); +$urpmi_lock and $urpmi_lock->unlock; +$rpm_lock and $rpm_lock->unlock; #- print sub for query. my $query_sub = sub { -- cgit v1.2.1