summaryrefslogtreecommitdiffstats
path: root/perl-install/pkgs.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-04-19 20:34:08 +0000
committerFrancois Pons <fpons@mandriva.com>2000-04-19 20:34:08 +0000
commitf453a6803dac9bd312371a59d5a4ae42e2cad35e (patch)
tree4c861205edbd7841e916b7dc26b779458b9b1415 /perl-install/pkgs.pm
parent59e7ea4bfc0abe3f1da710369ef377a08c9626d2 (diff)
downloaddrakx-backup-do-not-use-f453a6803dac9bd312371a59d5a4ae42e2cad35e.tar
drakx-backup-do-not-use-f453a6803dac9bd312371a59d5a4ae42e2cad35e.tar.gz
drakx-backup-do-not-use-f453a6803dac9bd312371a59d5a4ae42e2cad35e.tar.bz2
drakx-backup-do-not-use-f453a6803dac9bd312371a59d5a4ae42e2cad35e.tar.xz
drakx-backup-do-not-use-f453a6803dac9bd312371a59d5a4ae42e2cad35e.zip
*** empty log message ***
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r--perl-install/pkgs.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 4744e924c..16ce2fe27 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -338,8 +338,9 @@ sub psUsingHdlists {
my ($hdlist, $medium, $rpmsdir, $descr) = @$_;
my $f = install_any::getFile($hdlist) or die "no $hdlist found";
- #- make sure the first medium is always selected! so select any less than 2.
- psUsingHdlist($prefix, $method, \@packages, $f, $hdlist, $medium, $rpmsdir, $descr, ($medium < 2 || $method ne 'cdrom'));
+ #- make sure the first medium is always selected!
+ #- by default select all image.
+ psUsingHdlist($prefix, $method, \@packages, $f, $hdlist, $medium, $rpmsdir, $descr, 1);
}
log::l("psUsingHdlists read " . scalar keys(%{$packages[0]}) . " headers on " . scalar keys(%{$packages[2]}) . " hdlists");
@@ -911,6 +912,8 @@ sub install($$$;$$) {
} while (scalar(@transToInstall) == 0); #- avoid null transaction, it a nop that cost a bit.
}
+ #- reset file descriptor open too.
+ install_any::getFile('XXX');
#- reset ftp handlers before forking, otherwise well ;-(
require ftp;
ftp::rewindGetFile();