holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Revise fix for extraneous progress messages

Browse Source
This commit is contained in:
Tom Eastep 2010-09-27 16:16:29 -07:00
parent 43c7e4f12b
commit 51f79f40ec
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1568,7 +1568,6 @@ sub do_open_file( $ ) {
my $fname = $_[0]; my $fname = $_[0];
open $currentfile, '<', $fname or fatal_error "Unable to open $fname: $!"; open $currentfile, '<', $fname or fatal_error "Unable to open $fname: $!";
$currentlinenumber = 0; $currentlinenumber = 0;
$first_entry = 0;
$currentfilename = $fname; $currentfilename = $fname;
} }
@ -1577,7 +1576,12 @@ sub open_file( $ ) {
assert( ! defined $currentfile ); assert( ! defined $currentfile );
-f $fname && -s _ ? do_open_file $fname : ''; if ( -f $fname && -s _ ) {
$first_entry = 0;
do_open_file $fname;;
} else {
'';
}
} }
# #