From 5b4d5c4d20ed6beb1efac54dc6c03de8df4c4681 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 13 Dec 2012 09:54:14 +0000
Subject: simplify using cat_()

---
 urpm/media.pm | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'urpm/media.pm')

diff --git a/urpm/media.pm b/urpm/media.pm
index 687e2c6d..92f4a777 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -185,26 +185,19 @@ sub _read_config__read_media_info {
 	$distribconf->settree('mandriva');
 	$distribconf->parse_mediacfg($media_cfg) or next;
     
-	if (open(my $URLS, '<', $media_dir . '/url')) {
-	    local $_;
-	    while (<$URLS>) {
-		chomp($_);
-		foreach my $medium ($distribconf->listmedia) {
-		    my $medium_path = reduce_pathname($_ . '/' . $distribconf->getpath($medium, 'path'));
-		    $url2mediamap{$medium_path} = [$distribconf, $medium];
-		}
+	foreach (cat_($media_dir . '/url')) {
+	    chomp($_);
+	    foreach my $medium ($distribconf->listmedia) {
+		my $medium_path = reduce_pathname($_ . '/' . $distribconf->getpath($medium, 'path'));
+		$url2mediamap{$medium_path} = [$distribconf, $medium];
 	    }
 	}
 
-	if (open(my $MIRRORLISTS, '<', $media_dir . '/mirrorlist')) {
-	    local $_;
-	    while (<$MIRRORLISTS>) {
-		my $mirrorlist = $_;
-		chomp($mirrorlist);
-		foreach my $medium ($distribconf->listmedia) {
-		    my $medium_path = $distribconf->getpath($medium, 'path');
-		    $mirrorlist2mediamap{$mirrorlist}{$medium_path} = [ $distribconf, $medium ];
-		}
+	foreach my $mirrorlist (cat_($media_dir . '/mirrorlist')) {
+	    chomp($mirrorlist);
+	    foreach my $medium ($distribconf->listmedia) {
+		my $medium_path = $distribconf->getpath($medium, 'path');
+		$mirrorlist2mediamap{$mirrorlist}{$medium_path} = [ $distribconf, $medium ];
 	    }
 	}
     }
-- 
cgit v1.2.1