mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-15 04:04:10 +01:00
Another round of Macro fiddling
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6185 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
e2e316c6c7
commit
fcbe8768c3
@ -112,9 +112,8 @@ sub merge_macro_source_dest( $$ ) {
|
||||
sub merge_macro_column( $$ ) {
|
||||
my ( $body, $invocation ) = @_;
|
||||
|
||||
if ( defined $invocation && $invocation ne '' ) {
|
||||
return ( $body || '') if $invocation eq '-';
|
||||
$invocation || '';
|
||||
if ( defined $invocation && $invocation ne '' && $invocation ne '-' ) {
|
||||
$invocation;
|
||||
} else {
|
||||
$body || '';
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user