From 60d85b7e9fe14eeff84053cc1585ca45eaa3f1ab Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 23 Nov 2006 08:33:45 +0000
Subject: don't have a global variable to hold locks, otherwise code can't lock
 twice non-exclusive

---
 urpmf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'urpmf')

diff --git a/urpmf b/urpmf
index 2ca63804..7feb8b90 100755
--- a/urpmf
+++ b/urpmf
@@ -190,12 +190,12 @@ if ($env) {
     $urpm->{statedir} = $env;
 }
 
-{
+my $lock = do {
     #- lock to avoid concurrent media updates,
     #- but don't die if it doesn't work
     local $urpm->{fatal} = sub { printf STDERR "%s\n", $_[1] };
     urpm::sys::lock_urpmi_db($urpm);
-}
+};
 my $need_hdlist = grep { $usedtags{$_} } qw(
     buildhost
     buildtime
@@ -219,7 +219,7 @@ urpm::media::configure($urpm,
     callback => $callback,
     need_hdlist => $need_hdlist,
 );
-urpm::sys::unlock_urpmi_db($urpm);
+urpm::sys::unlock($lock);
 
 if ($need_hdlist) {
     # @hdmedia is the list of all media searched that use hdlists
-- 
cgit v1.2.1