diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-12-05 12:31:40 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-12-05 12:31:40 +0000 |
| commit | 3fd4689004ca8efb14329cc38e678af2b876d688 (patch) | |
| tree | 2f56089e737d9f95055c619dd0ee2376f87ce242 | |
| parent | b81db58cbce74fc30603fab02f5a11d75240c62f (diff) | |
| download | rpmdrake-3fd4689004ca8efb14329cc38e678af2b876d688.tar rpmdrake-3fd4689004ca8efb14329cc38e678af2b876d688.tar.gz rpmdrake-3fd4689004ca8efb14329cc38e678af2b876d688.tar.bz2 rpmdrake-3fd4689004ca8efb14329cc38e678af2b876d688.tar.xz rpmdrake-3fd4689004ca8efb14329cc38e678af2b876d688.zip | |
(get_pkgs,open_urpmi_db) fix fetching updates from non update media in
MandrivaUpdate (#35009)
| -rw-r--r-- | Rpmdrake/open_db.pm | 5 | ||||
| -rw-r--r-- | Rpmdrake/pkg.pm | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Rpmdrake/open_db.pm b/Rpmdrake/open_db.pm index e831f808..4d756657 100644 --- a/Rpmdrake/open_db.pm +++ b/Rpmdrake/open_db.pm @@ -83,13 +83,14 @@ sub fast_open_urpmi_db() { $urpm; } -sub open_urpmi_db() { +sub open_urpmi_db { + my (%urpmi_options) = @_; 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}}); $urpm->{lock} = urpm::lock::urpmi_db($urpm, undef, wait => $urpm->{options}{wait_lock}); - urpm::media::configure($urpm, media => $media, if_($searchmedia, searchmedia => $searchmedia)); + urpm::media::configure($urpm, media => $media, if_($searchmedia, searchmedia => $searchmedia), %urpmi_options); $urpm; } diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 049f30ba..5d8b4114 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -239,7 +239,7 @@ sub get_pkgs { warn_about_media($w, $opts); - my $urpm = open_urpmi_db(); + my $urpm = open_urpmi_db(update => $probe_only_for_updates); my $_drop_lock = before_leaving { undef $urpm->{lock} }; |