summaryrefslogtreecommitdiffstats
path: root/perl-install/pkgs.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-12 15:55:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-12 15:55:55 +0000
commit8fe0ce392f4dde3174c593ed2a2cf0e7add4171a (patch)
treea58c108d8da836812eb65cabbbfabb3f8ad79e2f /perl-install/pkgs.pm
parent4bd77b159315f5c646efb2ed622b929ae5904551 (diff)
downloaddrakx-8fe0ce392f4dde3174c593ed2a2cf0e7add4171a.tar
drakx-8fe0ce392f4dde3174c593ed2a2cf0e7add4171a.tar.gz
drakx-8fe0ce392f4dde3174c593ed2a2cf0e7add4171a.tar.bz2
drakx-8fe0ce392f4dde3174c593ed2a2cf0e7add4171a.tar.xz
drakx-8fe0ce392f4dde3174c593ed2a2cf0e7add4171a.zip
put everything in %compssUsers, use field flags for the flags :)
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r--perl-install/pkgs.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index cc3d083a7..acc73abcf 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -658,7 +658,7 @@ sub read_rpmsrate {
sub readCompssUsers {
my ($packages, $meta_class) = @_;
- my (%compssUsers, %compssUsersIcons, , %compssUsersDescr, @sorted, $l);
+ my (%compssUsers, @sorted, $l);
my (%compss);
my $file = 'Mandrake/base/compssUsers';
@@ -672,15 +672,15 @@ sub readCompssUsers {
my ($icon, $descr);
/^(.*?)\s*\[icon=(.*?)\](.*)/ and $_ = "$1$3", $icon = $2;
/^(.*?)\s*\[descr=(.*?)\](.*)/ and $_ = "$1$3", $descr = $2;
- $compssUsersIcons{$_} = $icon;
- $compssUsersDescr{$_} = $descr;
+ $compssUsers{$_}{icons} = $icon;
+ $compssUsers{$_}{descr} = $descr;
push @sorted, $_;
- $compssUsers{$_} = $l = [];
+ $compssUsers{$_}{flags} = $l = [];
} elsif (/^\s+(.*?)\s*$/) {
push @$l, $1;
}
}
- \%compssUsers, \@sorted, \%compssUsersIcons, \%compssUsersDescr;
+ \%compssUsers, \@sorted;
}
sub setSelectedFromCompssList {