diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-02-13 16:09:37 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-02-13 16:09:37 +0000 |
| commit | 36a627f0f79104e4af216bb3516456ccddf863e5 (patch) | |
| tree | 2fee0113023b98ee85b88f0f649500f77697e351 | |
| parent | 699bfa00f0b6864af132b4e7ab275b69cca17080 (diff) | |
| download | rpmdrake-36a627f0f79104e4af216bb3516456ccddf863e5.tar rpmdrake-36a627f0f79104e4af216bb3516456ccddf863e5.tar.gz rpmdrake-36a627f0f79104e4af216bb3516456ccddf863e5.tar.bz2 rpmdrake-36a627f0f79104e4af216bb3516456ccddf863e5.tar.xz rpmdrake-36a627f0f79104e4af216bb3516456ccddf863e5.zip | |
revert r234620 from today ("(get_pkgs,open_urpmi_db) ignore disabled backport
media in rpmdrake too, not just in MandrivaUpdate (#35009)") since it's broken
| -rw-r--r-- | Rpmdrake/open_db.pm | 2 | ||||
| -rw-r--r-- | Rpmdrake/pkg.pm | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/Rpmdrake/open_db.pm b/Rpmdrake/open_db.pm index 9925467e..221dad01 100644 --- a/Rpmdrake/open_db.pm +++ b/Rpmdrake/open_db.pm @@ -89,7 +89,7 @@ sub open_urpmi_db { my $urpm = fast_open_urpmi_db(); my $media = ref $::rpmdrake_options{media} ? join(',', @{$::rpmdrake_options{media}}) : ''; - my $searchmedia = join(',', map { $_->{name} } grep { $_->{ignore} && $_->{name} =~ /backport/i } @{$urpm->{media}}); + my $searchmedia = $urpmi_options{update} ? undef : join(',', map { $_->{name} } grep { $_->{ignore} && $_->{name} =~ /backport/i } @{$urpm->{media}}); urpm::media::configure($urpm, media => $media, if_($searchmedia, searchmedia => $searchmedia), %urpmi_options); $urpm; } diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 936117ea..71a025df 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -336,11 +336,6 @@ sub get_pkgs { my $requested = {}; my $state = {}; - my (@requested, @requested_strict); - - { - local $urpm->{searchmedia} = undef; - $urpm->request_packages_to_upgrade( $db, $state, @@ -348,9 +343,9 @@ sub get_pkgs { ); # list of updates (including those matching /etc/urpmi/skip.list): - @requested = sort map { urpm_name($_) } @{$urpm->{depslist}}[keys %$requested]; + my @requested = sort map { urpm_name($_) } @{$urpm->{depslist}}[keys %$requested]; # list of pure updates (w/o those matching /etc/urpmi/skip.list but with their deps): - @requested_strict = $probe_only_for_updates ? + my @requested_strict = $probe_only_for_updates ? sort map { urpm_name($_); } $urpm->resolve_requested($db, $state, $requested, callback_choices => \&Rpmdrake::gui::callback_choices) @@ -358,8 +353,6 @@ sub get_pkgs { # list updates including skiped ones + their deps in MandrivaUpdate: push @requested, difference2(\@requested_strict, \@requested) if $probe_only_for_updates; - } - if (!$probe_only_for_updates) { $urpm->compute_installed_flags($db); # TODO/FIXME: not for updates $urpm->{depslist}[$_]->set_flag_installed foreach keys %$requested; #- pretend it's installed |