aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-02-13 16:08:30 +0000
committerThierry Vignaud <tv@mandriva.org>2008-02-13 16:08:30 +0000
commit77d1f4bee4ba0a3898eaf08a157cca3c1c251a78 (patch)
treee38ad0df889a3a0540a0f391b4e698d15ffad25d /Rpmdrake
parent47dadf09019d36081268e08e66f9634ddd1ff8d6 (diff)
downloadrpmdrake-77d1f4bee4ba0a3898eaf08a157cca3c1c251a78.tar
rpmdrake-77d1f4bee4ba0a3898eaf08a157cca3c1c251a78.tar.gz
rpmdrake-77d1f4bee4ba0a3898eaf08a157cca3c1c251a78.tar.bz2
rpmdrake-77d1f4bee4ba0a3898eaf08a157cca3c1c251a78.tar.xz
rpmdrake-77d1f4bee4ba0a3898eaf08a157cca3c1c251a78.zip
revert r166945 from today ("- ignore disabled backport media in rpmdrake too,
not just in MandrivaUpdate (#35009)") since it's broken
Diffstat (limited to 'Rpmdrake')
-rw-r--r--Rpmdrake/open_db.pm2
-rw-r--r--Rpmdrake/pkg.pm11
2 files changed, 3 insertions, 10 deletions
diff --git a/Rpmdrake/open_db.pm b/Rpmdrake/open_db.pm
index 9f9e45fa..e8ff717b 100644
--- a/Rpmdrake/open_db.pm
+++ b/Rpmdrake/open_db.pm
@@ -95,7 +95,7 @@ sub open_urpmi_db {
my $urpm = fast_open_urpmi_db();
my $media = ref $::rpmdrake_options{media} ? join(',', @{$::rpmdrake_options{media}}) : '';
- my $searchmedia = join(',', get_inactive_backport_media($urpm));
+ my $searchmedia = $urpmi_options{update} ? undef : join(',', get_inactive_backport_media($urpm));
$urpm->{lock} = urpm::lock::urpmi_db($urpm, undef, wait => $urpm->{options}{wait_lock});
urpm::media::configure($urpm, media => $media, if_($searchmedia, searchmedia => $searchmedia), %urpmi_options);
$urpm;
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index e667183b..2fd79c4a 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -406,11 +406,6 @@ sub get_pkgs {
my $requested = {};
my $state = {};
- my (@requested, @requested_strict);
-
- {
- local $urpm->{searchmedia} = undef;
-
$urpm->request_packages_to_upgrade(
$db,
$state,
@@ -418,9 +413,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)
@@ -428,8 +423,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