From 96383ba7fe1fc97890f5d86e088caca3bcfc73c0 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Thu, 12 Aug 2004 09:31:49 +0000
Subject: First stab at supporting several hdlists on a supplementary CD

---
 perl-install/pkgs.pm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'perl-install/pkgs.pm')

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;
-- 
cgit v1.2.1