diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-08-12 09:31:49 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-08-12 09:31:49 +0000 |
| commit | 96383ba7fe1fc97890f5d86e088caca3bcfc73c0 (patch) | |
| tree | a649c3f74c185c0963a1d34643b2088299f190cf /perl-install/pkgs.pm | |
| parent | 3c9786002b9179fc49bd22b6b4d8eda0b277c6d1 (diff) | |
| download | drakx-96383ba7fe1fc97890f5d86e088caca3bcfc73c0.tar drakx-96383ba7fe1fc97890f5d86e088caca3bcfc73c0.tar.gz drakx-96383ba7fe1fc97890f5d86e088caca3bcfc73c0.tar.bz2 drakx-96383ba7fe1fc97890f5d86e088caca3bcfc73c0.tar.xz drakx-96383ba7fe1fc97890f5d86e088caca3bcfc73c0.zip | |
First stab at supporting several hdlists on a supplementary CD
Diffstat (limited to 'perl-install/pkgs.pm')
| -rw-r--r-- | perl-install/pkgs.pm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 25cdd9237..4bfe1e39f 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -378,13 +378,15 @@ sub psUpdateHdlistsDeps { } sub psUsingHdlists { - my ($prefix, $method) = @_; - my $listf = install_any::getFile('media/media_info/hdlists') or die "no hdlists found"; - my $packages = new URPM; + my ($prefix, $method, $hdlistsfile, $packages) = @_; + my $listf = install_any::getFile($hdlistsfile || 'media/media_info/hdlists') + or die "no hdlists found"; my $suppl_CDs = 0; - - #- add additional fields used by DrakX. - @$packages{qw(count mediums)} = (0, {}); + if (!$packages) { + $packages = new URPM; + #- add additional fields used by DrakX. + @$packages{qw(count mediums)} = (0, {}); + } #- parse hdlists file. my $medium_name = 1; |