From 8fe0ce392f4dde3174c593ed2a2cf0e7add4171a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 12 Mar 2001 15:55:55 +0000
Subject: put everything in %compssUsers, use field flags for the flags :)

---
 perl-install/pkgs.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

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