Add --noout option to sympa command line (see sympa-community#1518)

Author: ikedas

src/lib/Sympa/CLI.pm

@@ -41,6 +41,7 @@ use Sympa::Template;
 use Sympa::Tools::Data;
 
 my $language = Sympa::Language->instance;
+my $noout;
 
 sub run {
     my $class   = shift;
@@ -113,7 +114,7 @@ sub run {
     } elsif (
         not Getopt::Long::GetOptionsFromArray(
             \@argv, \%options,
-            qw(config|f=s debug|d lang|l=s log_level=s mail|m),
+            qw(config|f=s debug|d lang|l=s log_level=s mail|m noout),
             $class->_options
         )
     ) {
@@ -124,6 +125,8 @@ sub run {
         return undef;
     }
 
+    $noout = $options{noout};
+
     # Get privileges and load config if necessary.
     # Otherwise only setup language if specified.
     $language->set_lang($options{lang}) if $options{lang};
@@ -347,26 +350,29 @@ sub _report {
     my $class   = shift;
     my $spindle = shift;
 
-    my @reports = @{$spindle->{stash} || []};
-    @reports = ([undef, 'notice', 'performed']) unless @reports;
-
-    my $template = Sympa::Template->new('*', subdir => 'mail_tt2');
-    foreach my $report (@reports) {
-        my ($request, $report_type, $report_entry, $report_param) = @$report;
-        my $action = $request ? $request->{action} : 'sympa';
-        my $message = '';
-        $template->parse(
-            {   report_type  => $report_type,
-                report_entry => $report_entry,
-                report_param => ($report_param || {}),
-            },
-            'report.tt2',
-            \$message
-        );
-        $message ||= $report_entry;
-        $message =~ s/\n/ /g;
-
-        warn sprintf "%s [%s] %s\n", $action, $report_type, $message;
+    unless ($noout) {
+        my @reports = @{$spindle->{stash} || []};
+        @reports = ([undef, 'notice', 'performed']) unless @reports;
+
+        my $template = Sympa::Template->new('*', subdir => 'mail_tt2');
+        foreach my $report (@reports) {
+            my ($request, $report_type, $report_entry, $report_param) =
+                @$report;
+            my $action = $request ? $request->{action} : 'sympa';
+            my $message = '';
+            $template->parse(
+                {   report_type  => $report_type,
+                    report_entry => $report_entry,
+                    report_param => ($report_param || {}),
+                },
+                'report.tt2',
+                \$message
+            );
+            $message ||= $report_entry;
+            $message =~ s/\n/ /g;
+
+            warn sprintf "%s [%s] %s\n", $action, $report_type, $message;
+        }
     }
 
     return $spindle->success ? 1 : undef;
@@ -406,7 +412,9 @@ sub _translate_warn {
     return $output;
 }
 
-$SIG{__WARN__} = sub { warn _translate_warn(shift) };
+$SIG{__WARN__} = sub {
+    warn _translate_warn(shift) unless $noout;
+};
 
 my $arg_labels = {
     list    => {gettext_id => 'list'},

src/lib/Sympa/CLI/config.pm

@@ -65,7 +65,10 @@ sub _run {
             only_changed => 1,
             filter => ([@{$options->{output} // []}, qw(explicit mandatory)])
         );
-        return 1 unless defined $out;
+        unless (defined $out) {
+            warn "Not changed.\n";
+            return 1;
+        }
 
         my $sympa_conf = Sympa::Constants::CONFIG();
         my $date = POSIX::strftime('%Y%m%d%H%M%S', localtime time);

src/sbin/sympa.pl.in

@@ -281,6 +281,10 @@ Sets Sympa log level.
 
 Enable SMTP logging.
 
+=item C<--noout>
+
+Skip output to the console except for fatal error messages.
+
 =back
 
 =head1 COMMANDS
@@ -921,4 +925,6 @@ F<sympa_msg.pl> daemon.
 As of Sympa 6.2.68, F<sympa.pl> was renamed to F<sympa>
 and the new form of command line arguments was introduced.
 
+The C<--noout> option was introduced on Sympa 6.2.71b.
+
 =cut