Commit 914860d9 authored by IKEDA Soji's avatar IKEDA Soji
Browse files

perltidy'ing.

parent a2799441
......@@ -190,10 +190,8 @@ sub load {
# Will force the robot.conf reloading, as sympa.conf is the default.
$force_reload = 1;
## Loading the Sympa main config file.
if (my $config_loading_result = _load_config_file_to_hash(
{'path_to_config_file' => $config_file}
)
) {
if (my $config_loading_result =
_load_config_file_to_hash({'path_to_config_file' => $config_file})) {
%line_numbered_config =
%{$config_loading_result->{'numbered_config'}};
%Conf = %{$config_loading_result->{'config'}};
......@@ -209,8 +207,7 @@ sub load {
# we found in the config file are all well defined Sympa parameters.
$config_err += _detect_unknown_parameters_in_config(
{ 'config_hash' => \%Conf,
'config_file_line_numbering_reference' =>
\%line_numbered_config,
'config_file_line_numbering_reference' => \%line_numbered_config,
}
);
......@@ -1368,8 +1365,11 @@ sub load_automatic_lists_description {
},
);
# find appropriate automatic_lists_description.conf file
my $config = Sympa::search_fullpath($robot,
'automatic_lists_description.conf', subdir => ('families/' . $family));
my $config = Sympa::search_fullpath(
$robot,
'automatic_lists_description.conf',
subdir => ('families/' . $family)
);
return undef unless $config;
my $description =
load_generic_conf_file($config, \%automatic_lists_params);
......@@ -1971,8 +1971,8 @@ sub _infer_robot_parameter_values {
if not defined $param->{'config_hash'}{'domain'}
and defined $param->{'config_hash'}{'host'};
$param->{'config_hash'}{'wwsympa_url'} ||=
sprintf 'http://%s/sympa', $param->{'config_hash'}{'domain'};
$param->{'config_hash'}{'wwsympa_url'} ||= sprintf 'http://%s/sympa',
$param->{'config_hash'}{'domain'};
$param->{'config_hash'}{'static_content_url'} ||=
$Conf{'static_content_url'};
......@@ -2141,10 +2141,8 @@ sub _load_single_robot_config {
my $config_err;
my $config_file = "$Conf{'etc'}/$robot/robot.conf";
if (my $config_loading_result = _load_config_file_to_hash(
{'path_to_config_file' => $config_file}
)
) {
if (my $config_loading_result =
_load_config_file_to_hash({'path_to_config_file' => $config_file})) {
$robot_conf = $config_loading_result->{'config'};
$config_err = $config_loading_result->{'errors'};
} else {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment