extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-17 02:00:57 +01: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

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

@ -4941,23 +4941,26 @@ 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/ ) {
$dir =~ s|/+$||; if ( ! -w $dir ) {
warning_message "$dir not processed (not writeable)";
} else {
$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:$!";
while ( my $file = readdir( $dirhandle ) ) { while ( my $file = readdir( $dirhandle ) ) {
unless ( $file eq 'capabilities' || unless ( $file eq 'capabilities' ||
$file eq 'params' || $file eq 'params' ||
$file =~ /^shorewall6?.conf$/ || $file =~ /^shorewall6?.conf$/ ||
$file =~ /\.bak$/ ) { $file =~ /\.bak$/ ) {
$file = "$dir/$file"; $file = "$dir/$file";
if ( -f $file && -w _ ) { if ( -f $file && -w _ ) {
# #
# writeable regular file # writeable regular file
# #
my $result = system << "EOF"; my $result = system << "EOF";
perl -pi.bak -e '/^\\s*FORMAT\\s*/ && s/FORMAT/?FORMAT/; perl -pi.bak -e '/^\\s*FORMAT\\s*/ && s/FORMAT/?FORMAT/;
if ( /^\\s*COMMENT\\s+/ ) { if ( /^\\s*COMMENT\\s+/ ) {
s/COMMENT/?COMMENT/; s/COMMENT/?COMMENT/;
@ -4965,20 +4968,25 @@ perl -pi.bak -e '/^\\s*FORMAT\\s*/ && s/FORMAT/?FORMAT/;
s/COMMENT/?COMMENT/; s/COMMENT/?COMMENT/;
}' $file }' $file
EOF 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 ) {
warning message "Unable to rename ${file}.bak to $file:$!"; progress_message " File $file not updated -- no bare 'COMMENT' or 'FORMAT' lines found";
} else {
warning message "Unable to rename ${file}.bak to $file:$!";
}
} else {
warning_message ("Unable to update file ${file}.bak:$!" );
} }
} else { } else {
warning_message ("Unable to update file ${file}.bak:$!" ); warning_message( "$file skipped (not writeable)" ) unless -d _;
} }
} }
} }
}
closedir $dirhandle; closedir $dirhandle;
}
} }
} }
} }