summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-04 13:24:13 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-04 13:24:13 +0000
commita23b7facf36c16d214824d7807a2eb6c82e7f873 (patch)
treeae1ce2b87c4190f50cff50bd4697a5ca2cb1e727 /perl-install
parent3cc1801d828dd2d3e5fb1b12e20c1b0566e85e4c (diff)
downloaddrakx-a23b7facf36c16d214824d7807a2eb6c82e7f873.tar
drakx-a23b7facf36c16d214824d7807a2eb6c82e7f873.tar.gz
drakx-a23b7facf36c16d214824d7807a2eb6c82e7f873.tar.bz2
drakx-a23b7facf36c16d214824d7807a2eb6c82e7f873.tar.xz
drakx-a23b7facf36c16d214824d7807a2eb6c82e7f873.zip
Don't ask for the same cd to be reinserted when copying rpms on disk
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_any.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index cab260b0c..69cafb1ba 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -711,7 +711,9 @@ Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.",
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 {
+ my $cd_k = getCDNumber($m->{description});
+ my $cd_cur = getCDNumber($o->{packages}{mediums}{$current_medium}{description});
+ $cd_k ne $cd_cur and do {
askChangeMedium($o->{method}, $k)
or next;
mountCdrom("/tmp/image", $cdrom) if $o->{method} eq 'cdrom';