From 267bc808f5de9d807c63f6af47b01c1ae7f4887a Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 22 Aug 2009 09:39:15 -0700 Subject: [PATCH] Use 'set_command()' in the 'compile' case as well as the 'check' case --- Shorewall/Perl/Shorewall/Compiler.pm | 1 + Shorewall/Perl/Shorewall/Config.pm | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm index 0a0e3ab3d..90b6cb8d3 100644 --- a/Shorewall/Perl/Shorewall/Compiler.pm +++ b/Shorewall/Perl/Shorewall/Compiler.pm @@ -597,6 +597,7 @@ sub compiler { require_capability( 'MANGLE_ENABLED' , 'Traffic Shaping' , 's' ) if $config{TC_ENABLED}; if ( $objectfile ) { + set_command( 'compile', 'Compiling', 'Compiled' ); create_temp_object( $objectfile , $export ); } else { set_command( 'check', 'Checking', 'Checked' ); diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 2c5366741..a7815f42d 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -303,9 +303,7 @@ sub initialize( $ ) { ( $product, $Product, $toolname, $toolNAME ) = qw( shorewall6 Shorewall6 ip6tables IP6TABLES ); } - ( $command, $doing, $done ) = qw/compile Compiling Compiled/; #describe the current command, it's present progressive, and it's completion. - - $verbosity = 0; # Verbosity setting. 0 = almost silent, 1 = major progress messages only, 2 = all progress messages (very noisy) + $verbosity = 0; # Verbosity setting. -1 = silent, 0 = almost silent, 1 = major progress messages only, 2 = all progress messages (very noisy) $log = undef; # File reference for log file $log_verbosity = -1; # Verbosity of log. $timestamp = ''; # If true, we are to timestamp each progress message