diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-03-14 15:39:41 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-03-14 15:39:41 +0000 |
| commit | 3c54572bcc95094cfae999bf6c42a84fbdc13b72 (patch) | |
| tree | 64a9f94c62c128d314357abc412155b660ce4fb3 | |
| parent | 79ea105ded7d7a7c35a3a3920249ca85038a3625 (diff) | |
| download | drakx-3c54572bcc95094cfae999bf6c42a84fbdc13b72.tar drakx-3c54572bcc95094cfae999bf6c42a84fbdc13b72.tar.gz drakx-3c54572bcc95094cfae999bf6c42a84fbdc13b72.tar.bz2 drakx-3c54572bcc95094cfae999bf6c42a84fbdc13b72.tar.xz drakx-3c54572bcc95094cfae999bf6c42a84fbdc13b72.zip | |
(readCompssUsers): change the key of compssUsers, added "label"
(computeGroupSize): fix bug
| -rw-r--r-- | perl-install/pkgs.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 141c7c774..2869a6d25 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -649,8 +649,8 @@ sub readCompssUsers { /^(.*?)\s*\[path=(.*?)\](.*)/ and $_ = "$1$3", $path = $2; /^(.*?)\s*\[icon=(.*?)\](.*)/ and $_ = "$1$3", $icon = $2; /^(.*?)\s*\[descr=(.*?)\](.*)/ and $_ = "$1$3", $descr = $2; - $compssUsers{$_} = { verbatim => $verbatim, path => $path, icons => $icon, descr => $descr, flags => $l=[] }; - push @sorted, $_; + $compssUsers{"$path|$_"} = { label => $_, verbatim => $verbatim, path => $path, icons => $icon, descr => $descr, flags => $l=[] }; + push @sorted, "$path|$_"; } elsif (/^\s+(.*?)\s*$/) { push @$l, $1; } @@ -763,7 +763,7 @@ sub computeGroupSize { next if !$rate || $rate < $min_level; my $flags = join("\t", @flags = or_ify(@flags)); - $group{$_} = $flags =~ /SYSTEM/ ? 'SYSTEM' : ($memo{$flags} ||= or_clean(@flags)); + $group{packageName($p)} = $flags =~ /SYSTEM/ ? 'SYSTEM' : ($memo{$flags} ||= or_clean(@flags)); #- determine the packages that will be selected when selecting $p. the packages are not selected. my %newSelection; |