summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-19 17:22:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-19 17:22:55 +0000
commit76769bba270fb96b42fa88a00e94392db623ef7f (patch)
treef835287ca44e65abf4c4f3c21efbffa6d0b98620
parent726f1eb8a39ffb0c6a725e9a2651f28a9cc127c8 (diff)
downloaddrakx-76769bba270fb96b42fa88a00e94392db623ef7f.tar
drakx-76769bba270fb96b42fa88a00e94392db623ef7f.tar.gz
drakx-76769bba270fb96b42fa88a00e94392db623ef7f.tar.bz2
drakx-76769bba270fb96b42fa88a00e94392db623ef7f.tar.xz
drakx-76769bba270fb96b42fa88a00e94392db623ef7f.zip
in my tests with drakx-in-chroot, i end up change_phys_medium being called by
get_file_and_size, so ensure $o->{packages} is passed, otherwise it breaks needToCopy action
-rw-r--r--perl-install/install/media.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 576f59ba2..9dbfaabf9 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -377,7 +377,7 @@ sub get_file_and_size {
my $f2 = path($phys_m, $f);
if (! -f $f2) {
- change_phys_medium($phys_m, $f);
+ change_phys_medium($phys_m, $f, $::o->{packages});
}
open_file_and_size($f2);
}
@@ -580,7 +580,7 @@ sub url2mounted_phys_medium {
my $phys_m = url2phys_medium($o, $url);
$phys_m->{name} = $o_name if $o_name; #- useful for CDs which prompts a name in change_phys_medium
- change_phys_medium($phys_m, $o_rel_file) or return;
+ change_phys_medium($phys_m, $o_rel_file, $o->{packages}) or return;
$phys_m;
}