mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-16 19:30:44 +01:00
Fix handling of Action extension scripts
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6195 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
16d22e9c27
commit
79d57a7751
@ -80,7 +80,7 @@ my %logactionchains;
|
||||
# Maps each used macro to it's 'macro. ...' file.
|
||||
#
|
||||
#
|
||||
# This function determines the logging for a subordinate action or a rule within a subordinate action
|
||||
# This function determines the logging for a subordinate action or a rule within a superior action
|
||||
#
|
||||
sub merge_levels ($$) {
|
||||
my ( $superior, $subordinate ) = @_;
|
||||
@ -179,7 +179,7 @@ sub createlogactionchain( $$ ) {
|
||||
if ( -f $file ) {
|
||||
progress_message "Processing $file...";
|
||||
|
||||
unless ( my $return = do $file ) {
|
||||
unless ( my $return = eval `cat $file` ) {
|
||||
fatal_error "Couldn't parse $file: $@" if $@;
|
||||
fatal_error "Couldn't do $file: $!" unless defined $return;
|
||||
fatal_error "Couldn't run $file" unless $return;
|
||||
|
Loading…
Reference in New Issue
Block a user