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

Correct a couple of issues with update -D

Browse Source 
- shorewall.conf.bak is no longer unlinked
- The mtime of all unaltered files is no longer updated
This commit is contained in:
Tom Eastep 2012-12-31 12:43:02 -08:00
parent 87715e5f0b
commit 34f8125416
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,7 +199,7 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_script
Exporter::export_ok_tags('internal'); Exporter::export_ok_tags('internal');
our $VERSION = '4.5_11'; our $VERSION = '4.5_12';
# #
# describe the current command, it's present progressive, and it's completion. # describe the current command, it's present progressive, and it's completion.
@ -635,7 +635,7 @@ sub initialize( $;$$) {
EXPORT => 0, EXPORT => 0,
KLUDGEFREE => '', KLUDGEFREE => '',
STATEMATCH => '-m state --state', STATEMATCH => '-m state --state',
VERSION => "4.5.11-RC1", VERSION => "4.5.12-Beta3",
CAPVERSION => 40509 , CAPVERSION => 40509 ,
); );
# #
@ -4750,7 +4750,10 @@ sub convert_to_directives() {
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' || $file =~ /\.bak$/ ) { unless ( $file eq 'capabilities' ||
$file eq 'params' ||
$file =~ /^shorewall6?.conf$/ ||
$file =~ /\.bak$/ ) {
$file = "$dir/$file"; $file = "$dir/$file";
if ( -f $file && -w _ ) { if ( -f $file && -w _ ) {
@ -4768,8 +4771,8 @@ 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 ( ! unlink "${file}.bak" ) { } elsif ( ! rename "${file}.bak" , $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:$!" );