aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-12-07 12:02:27 +0000
committerThierry Vignaud <tv@mandriva.org>2007-12-07 12:02:27 +0000
commit0969ff6d8d58e860a5f7f1b1aa053f18dc919e1f (patch)
treeb16026ce21256bf2dcf7e84a93b6d1cfa63250b5
parentc2203e06dbdb80504fed72872c8b0653bd851dc4 (diff)
downloadrpmdrake-0969ff6d8d58e860a5f7f1b1aa053f18dc919e1f.tar
rpmdrake-0969ff6d8d58e860a5f7f1b1aa053f18dc919e1f.tar.gz
rpmdrake-0969ff6d8d58e860a5f7f1b1aa053f18dc919e1f.tar.bz2
rpmdrake-0969ff6d8d58e860a5f7f1b1aa053f18dc919e1f.tar.xz
rpmdrake-0969ff6d8d58e860a5f7f1b1aa053f18dc919e1f.zip
(get_pkgs,open_urpmi_db) fix fetching updates from non update media in MandrivaUpdate (#35009)
-rw-r--r--Rpmdrake/open_db.pm5
-rw-r--r--Rpmdrake/pkg.pm2
2 files changed, 4 insertions, 3 deletions
diff --git a/Rpmdrake/open_db.pm b/Rpmdrake/open_db.pm
index aa3cf9d6..9925467e 100644
--- a/Rpmdrake/open_db.pm
+++ b/Rpmdrake/open_db.pm
@@ -84,12 +84,13 @@ 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::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 dcd90762..d08e36b1 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -240,7 +240,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 $_lock = urpm::lock::urpmi_db($urpm);