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};
@@ -406,7 +409,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/bouncers/reset.pm

@@ -55,7 +55,8 @@ sub _run {
         ) {
             $users++;
         } else {
-            printf STDERR "Unable to cancel bounce error for %s.\n", $i->{email};
+            warn sprintf "Unable to cancel bounce error for %s.\n",
+                $i->{email};
         }
         $errors++;
     }

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/lib/Sympa/CLI/dump.pm

@@ -65,10 +65,10 @@ sub _run {
         }
         foreach my $role (@roles) {
             unless ($list->dump_users($role)) {
-                printf STDERR "%s: Could not dump list users (%s)\n",
+                warn sprintf "%s: Could not dump list users (%s)\n",
                     $list->get_id, $role;
             } else {
-                printf STDERR "%s: Dumped list users (%s)\n",
+                warn sprintf "%s: Dumped list users (%s)\n",
                     $list->get_id, $role;
             }
         }

src/lib/Sympa/CLI/lowercase.pm

@@ -40,11 +40,11 @@ sub _run {
     my $class   = shift;
     my $options = shift;
 
-    print STDERR "Working on user_table...\n";
+    warn "Working on user_table...\n";
     my $total = _lowercase_field('user_table', 'email_user');
 
     if (defined $total) {
-        print STDERR "Working on subscriber_table...\n";
+        warn "Working on subscriber_table...\n";
         my $total_sub =
             _lowercase_field('subscriber_table', 'user_subscriber');
         if (defined $total_sub) {
@@ -57,7 +57,7 @@ sub _run {
         exit 1;
     }
 
-    printf STDERR "Total lowercased rows: %d\n", $total;
+    warn sprintf "Total lowercased rows: %d\n", $total;
 
     exit 0;
 }

src/lib/Sympa/CLI/restore.pm

@@ -65,10 +65,10 @@ sub _run {
         }
         foreach my $role (@roles) {
             unless ($list->restore_users($role)) {
-                printf STDERR "%s: Could not restore list users (%s)\n",
+                warn sprintf "%s: Could not restore list users (%s)\n",
                     $list->get_id, $role;
             } else {
-                printf STDERR "%s: Restored list users (%s)\n",
+                warn sprintf "%s: Restored list users (%s)\n",
                     $list->get_id, $role;
             }
         }

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