From e1974cbb326052dd3ed48a3d1fb26fc6fadec385 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 25 Jan 2008 18:57:58 +0000
Subject: (get_inactive_backport_media) split it out of open_urpmi_db() (needed
 for next commit)

---
 Rpmdrake/open_db.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Rpmdrake')

diff --git a/Rpmdrake/open_db.pm b/Rpmdrake/open_db.pm
index 78ad25cd..ecffd7c0 100644
--- a/Rpmdrake/open_db.pm
+++ b/Rpmdrake/open_db.pm
@@ -31,7 +31,7 @@ use urpm;
 
 use Exporter;
 our @ISA = qw(Exporter);
-our @EXPORT = qw(fast_open_urpmi_db open_rpm_db open_urpmi_db);
+our @EXPORT = qw(fast_open_urpmi_db get_inactive_backport_media open_rpm_db open_urpmi_db);
 
 
 # because rpm blocks some signals when rpm DB is opened, we don't keep open around:
@@ -84,12 +84,17 @@ sub fast_open_urpmi_db() {
     $urpm;
 }
 
+sub get_inactive_backport_media {
+    my ($urpm) = @_;
+    map { $_->{name} } grep { $_->{ignore} && $_->{name} =~ /backport/i } @{$urpm->{media}}
+}
+
 sub open_urpmi_db {
     my (%urpmi_options) = @_;
     my $urpm = fast_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}});
+    my $searchmedia = join(',', get_inactive_backport_media($urpm));
     $urpm->{lock} = urpm::lock::urpmi_db($urpm, undef, wait => $urpm->{options}{wait_lock});
     urpm::media::configure($urpm, media => $media, if_($searchmedia, searchmedia => $searchmedia), %urpmi_options);
     $urpm;
-- 
cgit v1.2.1