summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-13 11:22:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-13 11:22:08 +0000
commitb88d3c574f6ba81ef4b3b7f81b9dd39dbbd04560 (patch)
tree311a12d1083aa2ebcdeb2633474451b74f20ec10
parent30c30cf99450155d472ff17974a38d31e7d645a2 (diff)
downloaddrakx-backup-do-not-use-b88d3c574f6ba81ef4b3b7f81b9dd39dbbd04560.tar
drakx-backup-do-not-use-b88d3c574f6ba81ef4b3b7f81b9dd39dbbd04560.tar.gz
drakx-backup-do-not-use-b88d3c574f6ba81ef4b3b7f81b9dd39dbbd04560.tar.bz2
drakx-backup-do-not-use-b88d3c574f6ba81ef4b3b7f81b9dd39dbbd04560.tar.xz
drakx-backup-do-not-use-b88d3c574f6ba81ef4b3b7f81b9dd39dbbd04560.zip
(readCompssUsers): get the "path"
-rw-r--r--perl-install/pkgs.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index ac0e312ae..ddae5735b 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -669,10 +669,11 @@ sub readCompssUsers {
if (/^(\S.*)/) {
my $verbatim = $_;
- my ($icon, $descr);
+ my ($icon, $descr, $path);
+ /^(.*?)\s*\[path=(.*?)\](.*)/ and $_ = "$1$3", $path = $2;
/^(.*?)\s*\[icon=(.*?)\](.*)/ and $_ = "$1$3", $icon = $2;
/^(.*?)\s*\[descr=(.*?)\](.*)/ and $_ = "$1$3", $descr = $2;
- $compssUsers{$_} = { verbatim => $verbatim, icons => $icon, descr => $descr, flags => $l=[] };
+ $compssUsers{$_} = { verbatim => $verbatim, path => $path, icons => $icon, descr => $descr, flags => $l=[] };
push @sorted, $_;
} elsif (/^\s+(.*?)\s*$/) {
push @$l, $1;