aboutsummaryrefslogtreecommitdiffstats
path: root/Distribconf
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-05-26 09:32:40 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-05-26 09:32:40 +0000
commitdbcb8beea9a2ee863ec7b043724f3a80607c5f50 (patch)
treea752175cffd1072e7287185fa0c64a8be8c527fa /Distribconf
parent8bb0cabf8cd1c8b38084a4ce62dfd42554ebda79 (diff)
downloadrpmtools-dbcb8beea9a2ee863ec7b043724f3a80607c5f50.tar
rpmtools-dbcb8beea9a2ee863ec7b043724f3a80607c5f50.tar.gz
rpmtools-dbcb8beea9a2ee863ec7b043724f3a80607c5f50.tar.bz2
rpmtools-dbcb8beea9a2ee863ec7b043724f3a80607c5f50.tar.xz
rpmtools-dbcb8beea9a2ee863ec7b043724f3a80607c5f50.zip
Fix error messages
Diffstat (limited to 'Distribconf')
-rw-r--r--Distribconf/Build.pm19
1 files changed, 11 insertions, 8 deletions
diff --git a/Distribconf/Build.pm b/Distribconf/Build.pm
index fac096d..d0c5324 100644
--- a/Distribconf/Build.pm
+++ b/Distribconf/Build.pm
@@ -98,7 +98,7 @@ sub write_hdlists {
$distrib->getvalue($media, 'size') ? '('.$distrib->getvalue($media, 'size'). ')' : "",
) or return 0;
}
-
+
if (ref($hdlists) ne 'GLOB') {
close($h_hdlists);
}
@@ -136,7 +136,7 @@ sub write_version {
}
my @gmt = gmtime(time);
-
+
printf($h_version "Mandrakelinux %s %s-%s-%s%s %s\n",
$distrib->getvalue(undef, 'version') || 'cooker',
$distrib->getvalue(undef, 'branch') || 'cooker',
@@ -171,7 +171,7 @@ sub check {
$l eq 'E' and $error++;
printf $out "$l: $f\n", @msg;
};
-
+
$distrib->listmedia or $report_err->('W', "No media found in this config");
# Checking no overlap
@@ -192,17 +192,17 @@ sub check {
}
}
}
-
+
foreach my $media ($distrib->listmedia) {
-d $distrib->getfullpath($media, 'path') or
- $report_err->('E', "dir %s don't exist for media '%s'",
+ $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 don't exist for media '%s'",
+ -f $distrib->getfullpath($media, $_) or
+ $report_err->('E', "$_ %s doesn't exist for media '%s'",
$distrib->getpath($media, $_),
$media
);
@@ -228,11 +228,14 @@ The media.cfg has been improved by Warly <warly@mandrakesoft.com>.
Special thanks to Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> for
suggesting to use Config::IniFiles.
-Thanks to Sylvie Terjan <erinmargault@mandrake.org> for the spell checking.
+Thanks to Sylvie Terjan <erinmargault@mandrake.org> for the spell checking.
=head1 ChangeLog
$Log$
+ Revision 1.2 2005/05/26 09:32:40 rgarciasuarez
+ Fix error messages
+
Revision 1.1 2005/02/22 20:12:31 othauvin
- split Distribconf with Build
- add write_VERSION