From c76957cc3968d83903574179deece759d4690699 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 26 Sep 2011 08:51:05 -0700 Subject: [PATCH] Reword an error message Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 0d788aacd..96163ea20 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -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; } }