[libconfig-model-dpkg-perl] 29/36: Scanner: added quiet option for tests

[dod at debian.org]

This is an automated email from the git hooks/post-receive script.

dod pushed a commit to branch master
in repository libconfig-model-dpkg-perl.

commit 859e447d8dffc8a33f9ad077ee7e7e13164077fc
Author: Dominique Dumont <dod at debian.org>
Date:   Fri Oct 16 16:19:42 2015 +0200

    Scanner: added quiet option for tests
---
 lib/Dpkg/Copyright/Scanner.pm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/Dpkg/Copyright/Scanner.pm b/lib/Dpkg/Copyright/Scanner.pm
index dd54995..871a217 100644
--- a/lib/Dpkg/Copyright/Scanner.pm
+++ b/lib/Dpkg/Copyright/Scanner.pm
@@ -83,10 +83,18 @@ sub print_copyright ( %args ) {
     }
 }
 
+my $quiet;
+
+sub _warn ($msg) {
+    warn $msg unless $quiet;
+}
+
 # option to skip UNKNOWN ?
 # load a file to override some entries ?
 sub scan_files ( %args ) {
 
+    $quiet = $args{quiet} // 0;
+
     my @lines ;
     if (my $file = $ENV{COPYRIGHT_SCANNER_INPUT}) {
         @lines = path($file)->lines_utf8 ; # for tests
@@ -166,10 +174,10 @@ sub scan_files ( %args ) {
         }
 
         if ( $c =~ /no-info-found/ and $is_debian_package) {
-            warn "Path $f has no copyright info. Add a line in debian/fill.copyright.blank file\n";
+            _warn "Path $f has no copyright info. Add a line in debian/fill.copyright.blank file\n";
         }
         if ( $l =~/unknown/i and $is_debian_package ) {
-            warn "Path $f has no license info. Add a line in debian/fill.copyright.blank file\n";
+            _warn "Path $f has no license info. Add a line in debian/fill.copyright.blank file\n";
         }
 
         #say "Storing '$f' : '$c' '$l'";
@@ -178,7 +186,7 @@ sub scan_files ( %args ) {
 
     my @notused = grep { ! $fill_blank_data->{$_}{used} and $_; } sort keys %$fill_blank_data ;
     if (@notused) {
-        warn "Warning: the following entries from fill.copyright.blanks were not used\n- '"
+        _warn "Warning: the following entries from fill.copyright.blanks were not used\n- '"
             .join("'\n- '", at notused)."'\n";
     }
 
@@ -457,7 +465,7 @@ sub __load_fill_blank_data ($current_dir) {
     if ($debian->is_dir) {
         my @fills = $debian->children(qr/fill\.copyright\.blanks\.yml$/);
 
-        say "Note: loading @fills fixes from copyright fix files" if @fills;
+        say "Note: loading @fills fixes from copyright fix files" if @fills and not $quiet;
         foreach my $file ( @fills) {
             my $yaml = $file->slurp_utf8;
             my $data = Load $yaml;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git