summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-21 16:20:30 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-21 16:20:30 +0000
commit3101d0530c2a2871c32138f77bb6baca6ab6db02 (patch)
treecbbfd5c8f12984796c453929be69120f0d03e2e0 /perl-install
parent7d5adcd421f2ef91852dbe9f7dec05fb32591395 (diff)
downloaddrakx-3101d0530c2a2871c32138f77bb6baca6ab6db02.tar
drakx-3101d0530c2a2871c32138f77bb6baca6ab6db02.tar.gz
drakx-3101d0530c2a2871c32138f77bb6baca6ab6db02.tar.bz2
drakx-3101d0530c2a2871c32138f77bb6baca6ab6db02.tar.xz
drakx-3101d0530c2a2871c32138f77bb6baca6ab6db02.zip
Don't copy RPMs from supplementary media, except supplementary CDs
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_any.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 650a8d3d8..a38246aeb 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -555,6 +555,7 @@ sub setup_suppl_medium {
$supplmedium->{selected} = 1;
$supplmedium->{method} = $suppl_method;
$supplmedium->{with_hdlist} = 'media_info/hdlist.cz'; #- for install_urpmi
+ $supplmedium->{issuppl} = 1; #- remember it's a suppl medium
}
sub _media_rank {
@@ -690,8 +691,10 @@ Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.",
}
};
foreach my $k (pkgs::allMediums($o->{packages})) {
- my ($wait_w, $wait_message) = fs::format::wait_message($o); #- nb, this is only called when interactive
my $m = $o->{packages}{mediums}{$k};
+ #- don't copy rpms of supplementary media, except suppl CDs
+ next if $m->{issuppl} && $m->{medium} !~ /^\d+s$/;
+ my ($wait_w, $wait_message) = fs::format::wait_message($o); #- nb, this is only called when interactive
$wait_message->(N("Copying in progress") . "\n($m->{descr})"); #- XXX to be translated
if ($k != $current_medium) {
do {