From 8285908fc9382cd8964a3a73341bff5058921fd9 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@mandriva.com>
Date: Fri, 23 Apr 2010 15:39:58 +0000
Subject: honour search medias when using --auto-select

---
 NEWS            | 2 ++
 URPM/Resolve.pm | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index edd6d53..93d9566 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- when using auto-select, honour search-medias if some were specified
+
 Version 3.34.1 - 23 March 2010
 
 - check selected packages for unsatisfied requires when a promoted package is
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index ceeda9f..f6aab2f 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -1674,7 +1674,6 @@ sub request_packages_to_upgrade {
     $db->traverse(sub {
 	my ($pkg_installed) = @_;
 	my $name = $pkg_installed->name;
-
 	my $pkg;
 	if (exists $by_name{$name}) {
 	    if (my $p = $by_name{$name}) {
@@ -1700,6 +1699,10 @@ sub request_packages_to_upgrade {
 		$pkg = undef;
 	    }
 	}
+	if ($pkg && %options->{idlist} && !grep { $pkg->id == $_ } @{%options->{idlist}}) {
+		$urpm->{debug_URPM}("not auto-selecting $pkg->fullname because it's not in search medias");
+		$pkg = undef;
+	} 
 
 	$pkg and $urpm->{debug_URPM}("auto-select: adding " . $pkg->fullname . " replacing " .  $pkg_installed->fullname) if $urpm->{debug_URPM};
 	    
-- 
cgit v1.2.1