aboutsummaryrefslogtreecommitdiffstats
path: root/Distribconf
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-09-29 13:43:32 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-09-29 13:43:32 +0000
commit6586bc85c0c0ec2ab2de70dc7d76e72c43e62f7e (patch)
tree2fb8545ad3b81057bf9a6d0baa6595e11ecce808 /Distribconf
parent3e0570944ab2e312e8a57d242866fe8510052462 (diff)
downloadrpmtools-6586bc85c0c0ec2ab2de70dc7d76e72c43e62f7e.tar
rpmtools-6586bc85c0c0ec2ab2de70dc7d76e72c43e62f7e.tar.gz
rpmtools-6586bc85c0c0ec2ab2de70dc7d76e72c43e62f7e.tar.bz2
rpmtools-6586bc85c0c0ec2ab2de70dc7d76e72c43e62f7e.tar.xz
rpmtools-6586bc85c0c0ec2ab2de70dc7d76e72c43e62f7e.zip
Reports errors on STDERR, not STDOUT
Diffstat (limited to 'Distribconf')
-rw-r--r--Distribconf/Build.pm40
1 files changed, 21 insertions, 19 deletions
diff --git a/Distribconf/Build.pm b/Distribconf/Build.pm
index 4d22ec6..fb710a3 100644
--- a/Distribconf/Build.pm
+++ b/Distribconf/Build.pm
@@ -152,23 +152,23 @@ sub write_version {
}
-=head2 check($out)
+=head2 check($fhout)
-Perform a check on the distribution and print to $out (STDOUT by default)
-errors found
+Performs a check on the distribution and prints to $fhout (STDERR by default)
+warnings and errors found.
=cut
sub check {
- my ($distrib, $out) = @_;
- $out ||= \*STDOUT;
+ my ($distrib, $fhout) = @_;
+ $fhout ||= \*STDERR;
my $error = 0;
my $report_err = sub {
my ($l, $f, @msg) = @_;
$l eq 'E' and $error++;
- printf $out "$l: $f\n", @msg;
+ printf $fhout "$l: $f\n", @msg;
};
$distrib->listmedia or $report_err->('W', "No media found in this config");
@@ -193,19 +193,18 @@ sub check {
}
foreach my $media ($distrib->listmedia) {
- -d $distrib->getfullpath($media, 'path') or
- $report_err->('E', "dir %s does't exist for media '%s'",
- $distrib->getpath($media, 'path'),
- $media
- );
-
- foreach (qw/hdlist synthesis pubkey/) {
- -f $distrib->getfullpath($media, $_) or
- $report_err->('E', "$_ %s doesn't exist for media '%s'",
- $distrib->getpath($media, $_),
- $media
- );
- }
+ -d $distrib->getfullpath($media, 'path') or $report_err->(
+ 'E', "dir %s does't exist for media '%s'",
+ $distrib->getpath($media, 'path'),
+ $media
+ );
+ foreach (qw/hdlist synthesis pubkey/) {
+ -f $distrib->getfullpath($media, $_) or $report_err->(
+ 'E', "$_ %s doesn't exist for media '%s'",
+ $distrib->getpath($media, $_),
+ $media
+ );
+ }
}
return $error;
}
@@ -232,6 +231,9 @@ Thanks to Sylvie Terjan <erinmargault@mandriva.org> for the spell checking.
=head1 ChangeLog
$Log$
+ Revision 1.6 2005/09/29 13:43:32 rgarciasuarez
+ Reports errors on STDERR, not STDOUT
+
Revision 1.5 2005/09/29 12:28:04 rgarciasuarez
Spell check error message