diff options
author | Christophe Fergeau <cfergeau@mandriva.com> | 2010-04-23 15:39:58 +0000 |
---|---|---|
committer | Christophe Fergeau <cfergeau@mandriva.com> | 2010-04-23 15:39:58 +0000 |
commit | 8285908fc9382cd8964a3a73341bff5058921fd9 (patch) | |
tree | 4c9d70b6810e9716ac257370b161ad4bccd649e9 | |
parent | 42dc66fa7e525a706739623a4dba22a1f05b22cd (diff) | |
download | perl-URPM-8285908fc9382cd8964a3a73341bff5058921fd9.tar perl-URPM-8285908fc9382cd8964a3a73341bff5058921fd9.tar.gz perl-URPM-8285908fc9382cd8964a3a73341bff5058921fd9.tar.bz2 perl-URPM-8285908fc9382cd8964a3a73341bff5058921fd9.tar.xz perl-URPM-8285908fc9382cd8964a3a73341bff5058921fd9.zip |
honour search medias when using --auto-select
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | URPM/Resolve.pm | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -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}; |