summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-08 15:22:20 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-08 15:22:20 +0000
commitafc6f535a30a6808481862d5e726b2ece1604336 (patch)
treebc6105cf7b12cfcd3ae93c6c0c9ae72efab29202
parentb0a56eb3a16a83e142a10d1d397d421641452208 (diff)
downloaddrakx-afc6f535a30a6808481862d5e726b2ece1604336.tar
drakx-afc6f535a30a6808481862d5e726b2ece1604336.tar.gz
drakx-afc6f535a30a6808481862d5e726b2ece1604336.tar.bz2
drakx-afc6f535a30a6808481862d5e726b2ece1604336.tar.xz
drakx-afc6f535a30a6808481862d5e726b2ece1604336.zip
Don't copy rpms that come from any sort of supplementary media.
-rw-r--r--perl-install/install_any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 079005901..cd7079970 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -712,8 +712,8 @@ Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.",
};
foreach my $k (pkgs::allMediums($o->{packages})) {
my $m = $o->{packages}{mediums}{$k};
- #- don't copy rpms of supplementary media, except suppl CDs
- next if $m->{issuppl} && $m->{medium} !~ /^\d+s$/;
+ #- don't copy rpms of supplementary media
+ next if $m->{issuppl};#- && $m->{medium} !~ /^\d+s$/; XXX handle suppl CDs
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) {