- only print parse warnings if $config->{'warnings'} is set

- set warnings for expanddeps/substitutedeps

diff --git a/Build/Rpm.pm b/Build/Rpm.pm
index 108009c..37420ab 100644 (file)
--- a/Build/Rpm.pm
+++ b/Build/Rpm.pm
@@ -185,7 +185,7 @@ sub parse {
       my $tries = 0;
       while ($line =~ /^(.*?)%(\{([^\}]+)\}|[\?\!]*[0-9a-zA-Z_]+|%|\()(.*?)$/) {
        if ($tries++ > 1000) {
-         print STDERR "Warning: spec file parser ",($lineno?" line $lineno":''),": macro too deeply nested\n";
+         print STDERR "Warning: spec file parser ",($lineno?" line $lineno":''),": macro too deeply nested\n" if $config->{'warnings'};
          $line = 'MACRO';
          last;
        }
@@ -207,7 +207,7 @@ sub parse {
          $expandedline .= '%';
          next;
        } elsif ($macname eq '(') {
-         print STDERR "Warning: spec file parser",($lineno?" line $lineno":''),": can't expand %(...)\n";
+         print STDERR "Warning: spec file parser",($lineno?" line $lineno":''),": can't expand %(...)\n" if $config->{'warnings'};
          $line = 'MACRO';
          last;
        } elsif ($macname eq 'define' || $macname eq 'global') {
@@ -242,7 +242,7 @@ sub parse {
          $line = ((exists($macros{$args[0]}) ? 1 : 0) ^ ($macname eq 'undefined' || $macname eq 'without' ? 1 : 0)).$line;
        } elsif (exists($macros{$macname})) {
          if (!defined($macros{$macname})) {
-           print STDERR "Warning: spec file parser",($lineno?" line $lineno":''),": can't expand '$macname'\n";
+           print STDERR "Warning: spec file parser",($lineno?" line $lineno":''),": can't expand '$macname'\n" if $config->{'warnings'};
            $line = 'MACRO';
            last;
          }

diff --git a/expanddeps b/expanddeps
index f3a3e26..b7d5db9 100755 (executable)
--- a/expanddeps
+++ b/expanddeps
@@ -165,6 +165,7 @@ if (!defined($dist) || $dist eq '') {
 }
 
 my $cf = Build::read_config_dist($dist, $archs[0], $configdir);
+$cf->{'warnings'} = 1;
 
 #######################################################################
 

diff --git a/substitutedeps b/substitutedeps
index 950dac0..d04aa52 100755 (executable)
--- a/substitutedeps
+++ b/substitutedeps
@@ -62,6 +62,7 @@ $specdir = "./" if $specdir eq '';
 my $newspec = $ARGV[1];
 
 my $cf = Build::read_config_dist($dist, $archs, $configdir);
+$cf->{'warnings'} = 1;
 
 #######################################################################