extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-26 04:32:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add some warning/progress messages to help understand 'update -D' behavior.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-05-25 13:20:12 -07:00
parent 064f9f974c
commit 60d0a50d9d
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4941,7 +4941,10 @@ sub convert_to_directives() {
progress_message3 "Converting 'FORMAT' and 'COMMENT' lines to compiler directives..."; progress_message3 "Converting 'FORMAT' and 'COMMENT' lines to compiler directives...";
for my $dir ( @path ) { for my $dir ( @path ) {
unless ( $dir =~ /$dirtest/ || ! -w $dir ) { unless ( $dir =~ /$dirtest/ ) {
if ( ! -w $dir ) {
warning_message "$dir not processed (not writeable)";
} else {
$dir =~ s|/+$||; $dir =~ s|/+$||;
opendir( my $dirhandle, $dir ) || fatal_error "Cannot open directory $dir for reading:$!"; opendir( my $dirhandle, $dir ) || fatal_error "Cannot open directory $dir for reading:$!";
@ -4968,12 +4971,16 @@ EOF
if ( $result == 0 ) { if ( $result == 0 ) {
if ( system( "diff -q $file ${file}.bak > /dev/null" ) ) { if ( system( "diff -q $file ${file}.bak > /dev/null" ) ) {
progress_message3 " File $file updated - old file renamed ${file}.bak"; progress_message3 " File $file updated - old file renamed ${file}.bak";
} elsif ( ! rename "${file}.bak" , $file ) { } elsif ( rename "${file}.bak" , $file ) {
progress_message " File $file not updated -- no bare 'COMMENT' or 'FORMAT' lines found";
} else {
warning message "Unable to rename ${file}.bak to $file:$!"; warning message "Unable to rename ${file}.bak to $file:$!";
} }
} else { } else {
warning_message ("Unable to update file ${file}.bak:$!" ); warning_message ("Unable to update file ${file}.bak:$!" );
} }
} else {
warning_message( "$file skipped (not writeable)" ) unless -d _;
} }
} }
} }
@ -4981,6 +4988,7 @@ EOF
closedir $dirhandle; closedir $dirhandle;
} }
} }
}
} }
# #