extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-22 22:30:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reword an error message

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-09-26 08:51:05 -07:00
parent 4c7f1a03a0
commit c76957cc39
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall/Perl/Shorewall/Config.pm
View File

@ -1361,11 +1361,11 @@ sub split_line( $$$$ ) {
my @pairs = split( ' ', $pairs );
for ( @pairs ) {
fatal_error "Invalid column/value pair ($_)" unless /^(\w+)=(.*)$/;
fatal_error "Invalid column/value pair ($_)" unless /^(\w+)=(.+)$/;
my ( $column, $value ) = ( lc $1, $2 );
fatal_error "Unknown column ($1)" unless exists $columnsref->{$column};
$column = $columnsref->{$column};
fatal_error "Column $1 already has a value" unless $line[$column] eq '-';
fatal_error "The $1 column already has a value" unless $line[$column] eq '-';
$line[$column] = $value =~ /^"([^"]+)"$/ ? $1 : $value;
}
}
@ -1413,11 +1413,11 @@ sub split_line1( $$$$;$ ) {
my @pairs = split( ' ', $pairs );
for ( @pairs ) {
fatal_error "Invalid column/value pair ($_)" unless /^(\w+)=(.*)$/;
fatal_error "Invalid column/value pair ($_)" unless /^(\w+)=(.+)$/;
my ( $column, $value ) = ( lc $1, $2 );
fatal_error "Unknown column ($1)" unless exists $columnsref->{$column};
$column = $columnsref->{$column};
fatal_error "Column $1 already has a value" unless $line[$column] eq '-';
fatal_error "The $1 column already has a value" unless $line[$column] eq '-';
$line[$column] = $value =~ /^"([^"]+)"$/ ? $1 : $value;
}
}