summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-10-07 13:59:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-10-07 13:59:09 +0000
commit4c84df653f8e426d10f71323ac9a10a55d99b585 (patch)
treeb4f11b4dac408c8b0e6d2b0536873265943fe112
parenteb5981fa86571102b046565de0a7691292c1dede (diff)
downloaddrakx-4c84df653f8e426d10f71323ac9a10a55d99b585.tar
drakx-4c84df653f8e426d10f71323ac9a10a55d99b585.tar.gz
drakx-4c84df653f8e426d10f71323ac9a10a55d99b585.tar.bz2
drakx-4c84df653f8e426d10f71323ac9a10a55d99b585.tar.xz
drakx-4c84df653f8e426d10f71323ac9a10a55d99b585.zip
split readCompssUsers(): parsing is done in readCompssUsers_raw
-rw-r--r--perl-install/pkgs.pm10
1 files 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;