|
Lines 422-428
sub ConfigFileMerge
Link Here
|
| 422 |
my $var = $1; |
422 |
my $var = $1; |
| 423 |
$skipExpr = "\$fakeVar = $2\n"; |
423 |
$skipExpr = "\$fakeVar = $2\n"; |
| 424 |
if ( exists($newConf->{$var}) ) { |
424 |
if ( exists($newConf->{$var}) ) { |
| 425 |
my $d = Data::Dumper->new([$newConf->{$var}], [*value]); |
425 |
my $d = Data::Dumper->new([$newConf->{$var}]); |
| 426 |
$d->Indent(1); |
426 |
$d->Indent(1); |
| 427 |
$d->Terse(1); |
427 |
$d->Terse(1); |
| 428 |
$d->Sortkeys(1); |
428 |
$d->Sortkeys(1); |
|
Lines 454-459
sub ConfigFileMerge
Link Here
|
| 454 |
# |
454 |
# |
| 455 |
foreach my $var ( sort(keys(%$newConf)) ) { |
455 |
foreach my $var ( sort(keys(%$newConf)) ) { |
| 456 |
next if ( $done->{$var} ); |
456 |
next if ( $done->{$var} ); |
| 457 |
my $d = Data::Dumper->new([$newConf->{$var}], [*value]); |
457 |
my $d = Data::Dumper->new([$newConf->{$var}]); |
| 458 |
$d->Indent(1); |
458 |
$d->Indent(1); |
| 459 |
$d->Terse(1); |
459 |
$d->Terse(1); |
| 460 |
$d->Sortkeys(1); |
460 |
$d->Sortkeys(1); |
