From 4c84df653f8e426d10f71323ac9a10a55d99b585 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 7 Oct 2003 13:59:09 +0000 Subject: split readCompssUsers(): parsing is done in readCompssUsers_raw --- perl-install/pkgs.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index f79690b81..e98045b94 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -361,7 +361,7 @@ sub psUsingHdlists { chomp; s/\s*#.*$//; /^\s*$/ and next; - m/^\s*(noauto:)?(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or die "invalid hdlist description \"$_\" in hdlists file"; + m/^\s*(noauto:)?(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or die qq(invalid hdlist description "$_" in hdlists file); #- make sure the first medium is always selected! #- by default select all image. @@ -529,10 +529,16 @@ sub read_rpmsrate { sub readCompssUsers { my ($meta_class) = @_; - my (%compssUsers, @sorted, $l); my $file = 'Mandrake/base/compssUsers'; my $f = $meta_class && install_any::getFile("$file.$meta_class") || install_any::getFile($file) or die "can't find $file"; + readCompssUsers_raw($f); +} + +sub readCompssUsers_raw { + my ($f) = @_; + my (%compssUsers, @sorted, $l); + local $_; while (<$f>) { /^\s*$/ || /^#/ and next; -- cgit v1.2.1