summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-02-07 09:03:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-02-07 09:03:04 +0000
commit1dbf2fc9d6fc77fdea3314fc92bb1592447b2511 (patch)
treefd22f053b9ae18af9fbc3ec48cbeda815dde988a
parent946de008421a3fa64915da0be6228715c1ef62d6 (diff)
downloaddrakx-1dbf2fc9d6fc77fdea3314fc92bb1592447b2511.tar
drakx-1dbf2fc9d6fc77fdea3314fc92bb1592447b2511.tar.gz
drakx-1dbf2fc9d6fc77fdea3314fc92bb1592447b2511.tar.bz2
drakx-1dbf2fc9d6fc77fdea3314fc92bb1592447b2511.tar.xz
drakx-1dbf2fc9d6fc77fdea3314fc92bb1592447b2511.zip
fix setting @hdlists when deselectionAllowed is false
-rw-r--r--perl-install/pkgs.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index cd6c33f89..934de3aab 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -423,9 +423,11 @@ sub psUsingHdlists {
];
$cdsuppl ? ($medium_name = ($medium_name + 1) . 's') : ++$medium_name;
}
- my ($finalhdlists, $copy_rpms_on_disk);
- ($finalhdlists, $copy_rpms_on_disk) = $o->deselectFoundMedia(\@hdlists) if $deselectionAllowed && !defined $o_initialmedium;
- @hdlists = @$finalhdlists;
+ my $copy_rpms_on_disk = 0;
+ if ($deselectionAllowed && !defined $o_initialmedium) {
+ (my $finalhdlists, $copy_rpms_on_disk) = $o->deselectFoundMedia(\@hdlists);
+ @hdlists = @$finalhdlists;
+ }
foreach my $h (@hdlists) {
#- make sure the first medium is always selected!