diff options
| author | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2011-03-09 06:57:00 +0000 |
|---|---|---|
| committer | Per Øyvind Karlsen <peroyvind@mandriva.org> | 2011-03-09 06:57:00 +0000 |
| commit | 043931b9bfa5a259fb193f5ffeff5907eb2d8d45 (patch) | |
| tree | 8e713e5d7863df07fa7efe6139c49cae3ba9b9bc | |
| parent | c3108621aea9515f86147866ac8d793b950557a4 (diff) | |
| download | perl-URPM-043931b9bfa5a259fb193f5ffeff5907eb2d8d45.tar perl-URPM-043931b9bfa5a259fb193f5ffeff5907eb2d8d45.tar.gz perl-URPM-043931b9bfa5a259fb193f5ffeff5907eb2d8d45.tar.bz2 perl-URPM-043931b9bfa5a259fb193f5ffeff5907eb2d8d45.tar.xz perl-URPM-043931b9bfa5a259fb193f5ffeff5907eb2d8d45.zip | |
honour search medias when using --auto-select (Christophe Fergeau)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 5 |
2 files changed, 5 insertions, 1 deletions
@@ -6,6 +6,7 @@ Version 3.33.1 - 9 March 2011, by Per Øyvind Karlsen - fix incorrect arch returned for packages without any (ie. public keys) - eliminate disttag & distepoch when extracting name, version, release to handle upgrade +- honour search medias when using --auto-select (Christophe Fergeau) Version 3.33 - 5 October 2009, by Christophe Fergeau diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 4f8a9e1..053a1f1 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -1668,7 +1668,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}) { @@ -1694,6 +1693,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") if $urpm->{debug_URPM}; + $pkg = undef; + } $pkg and $urpm->{debug_URPM}("auto-select: adding " . $pkg->fullname . " replacing " . $pkg_installed->fullname) if $urpm->{debug_URPM}; |