From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Tue, 25 Jul 2006 12:56:17 +0000 (+0200)
Subject: fixed v3.9 config parsing in web-queue-main
X-Git-Tag: holmes-import~629^2^2^2
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=c1d7055ed3ee447b02c7e430e0512e1aab5f6676;p=libucw.git

fixed v3.9 config parsing in web-queue-main
---

diff --git a/lib/perl/Config.pm b/lib/perl/Config.pm
index 8d98c561..aa62b9a9 100644
--- 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};
-		my $optlist = join(" ", keys %$opts);
+		my $optlist = join(";", 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) {
-			$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") {