From a30708519d178b886dbb5ccd1aae0ad812aab24e Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 1 Sep 2015 11:57:28 -0700 Subject: [PATCH] Correct progress messages Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 07c2dbba6..62ce4dbf9 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -5317,7 +5317,7 @@ sub convert_to_directives() { my $dirtest = qr|^$sharedir/+shorewall6?(?:/.*)?$|; - progress_message3 "Converting 'FORMAT' and 'COMMENT' lines to compiler directives..."; + progress_message3 "Converting 'FORMAT', 'SECTION' and 'COMMENT' lines to compiler directives..."; for my $dir ( @path ) { unless ( $dir =~ /$dirtest/ ) { @@ -5352,6 +5352,7 @@ EOF if ( system( "diff -q $file ${file}.bak > /dev/null" ) ) { progress_message3 " File $file updated - old file renamed ${file}.bak"; } elsif ( rename "${file}.bak" , $file ) { + progress_message " File $file not updated -- no bare 'COMMENT', 'SECTION' or 'FORMAT' lines found"; progress_message " File $file not updated -- no bare 'COMMENT' or 'FORMAT' lines found"; } else { warning message "Unable to rename ${file}.bak to $file:$!";