From 4a5c1e8c562dfa7a38a7c2fb29d02a8781c0987f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 21 Nov 2006 14:50:12 +0000
Subject: cleanup

---
 urpm.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'urpm.pm')

diff --git a/urpm.pm b/urpm.pm
index 903380a4..258540f7 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -650,11 +650,9 @@ sub configure {
 	}
 	if ($options{searchmedia}) {
 	   $urpm->select_media($options{searchmedia}); #- Ensure this media has been selected
-	   foreach (grep { !$_->{ignore} } @{$urpm->{media} || []}) {
-		$_->{name} eq $options{searchmedia} and do {
-			$_->{searchmedia} = 1;
-			last;
-		};
+	   if (my $medium = name2medium($urpm, $options{searchmedia})) {
+	       $medium->{ignore} and $urpm->{fatal}("searchmedia is ignored");
+	       $medium->{searchmedia} = 1;
 	   }
 	}
 	if ($options{excludemedia}) {
-- 
cgit v1.2.1