From 1b1a59805e4403ff23b472fd6cd2f1eeaf93a533 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 23 Nov 2007 13:14:49 +0000
Subject: (open_db::open_urpmi_db) for consistency, move locking here from
 pkg::get_pkgs()

---
 Rpmdrake/open_db.pm | 1 +
 Rpmdrake/pkg.pm     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'Rpmdrake')

diff --git a/Rpmdrake/open_db.pm b/Rpmdrake/open_db.pm
index aa3cf9d6..80a28bad 100644
--- a/Rpmdrake/open_db.pm
+++ b/Rpmdrake/open_db.pm
@@ -89,6 +89,7 @@ sub open_urpmi_db() {
     my $media = ref $::rpmdrake_options{media} ? join(',', @{$::rpmdrake_options{media}}) : '';
 
     my $searchmedia = join(',', map { $_->{name} } grep { $_->{ignore} && $_->{name} =~ /backport/i } @{$urpm->{media}});
+    $urpm->{lock} = urpm::lock::urpmi_db($urpm, undef);
     urpm::media::configure($urpm, media => $media, if_($searchmedia, searchmedia => $searchmedia));
     $urpm;
 }
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index bdee6b5b..6effac08 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -241,7 +241,7 @@ sub get_pkgs {
 
     my $urpm = open_urpmi_db();
 
-    my $_lock = urpm::lock::urpmi_db($urpm);
+    my $_drop_lock = before_leaving { undef $urpm->{lock} };
 
     # update media list in case warn_about_media() added some:
     @update_medias = get_update_medias($urpm);
-- 
cgit v1.2.1