Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / lib / perl / Config.pm

diff --git a/lib/perl/Config.pm b/lib/perl/Config.pm
index 8d98c5615aa92a8736430c4e21c4aea4bcd86d98..aa62b9a90081ba06ea36f4040598271415307252 100644 (file)
--- a/lib/perl/Config.pm
+++ b/lib/perl/Config.pm
@@ -28,12 +28,12 @@ sub Parse(@) {
        }
        foreach my $section (keys %Sections) {
                my $opts = $Sections{$section};
        }
        foreach my $section (keys %Sections) {
                my $opts = $Sections{$section};

-               my $optlist = join(" ", keys %$opts);
+               my $optlist = join(";", keys %$opts);

                my %filtered_opts = map { my $t=$_; $t=~s/[#\$]+$//; $t => $$opts{$_} } keys %$opts;
                my %filtered_opts = map { my $t=$_; $t=~s/[#\$]+$//; $t => $$opts{$_} } keys %$opts;

-               my @l = `bin/config $defargs $section $optlist`;
+               my @l = `bin/config $defargs "$section\{$optlist\}"`;

                $? && exit 1;
                foreach my $o (@l) {
                $? && exit 1;
                foreach my $o (@l) {

-                       $o =~ /^CF_([^=]+)='(.*)'\n$/ or die "Cannot parse bin/config output: $_";
+                       $o =~ /^CF_.*_([^=]+)='(.*)'\n$/ or die "Cannot parse bin/config output: $_";

                        my $var = $filtered_opts{$1};
                        my $val = $2;
                        if (ref $var eq "SCALAR") {
                        my $var = $filtered_opts{$1};
                        my $val = $2;
                        if (ref $var eq "SCALAR") {