From 98b9d42e9d9137b2308ea16de070b9d54b7a2591 Mon Sep 17 00:00:00 2001 From: Olivier Thauvin Date: Mon, 21 Feb 2005 12:47:34 +0000 Subject: - avoid error message about non existing media.cfg --- Distribconf.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Distribconf.pm b/Distribconf.pm index 1918195..b7e8884 100644 --- a/Distribconf.pm +++ b/Distribconf.pm @@ -323,7 +323,9 @@ Return 1 on success, 0 if media.cfg can't be found or is invalid. sub parse_mediacfg { my ($distrib, $mediacfg) = @_; $mediacfg ||= "$distrib->{root}/$distrib->{infodir}/media.cfg"; - ($distrib->{cfg} = new Config::IniFiles( -file => $mediacfg, -default => 'media_info', -allowcontinue => 1)) or return 0; + (-f $mediacfg && -r _) && + ($distrib->{cfg} = new Config::IniFiles( -file => $mediacfg, -default => 'media_info', -allowcontinue => 1)) + or return 0; return 1; } @@ -441,6 +443,9 @@ Thanks to Sylvie Terjan for the spell checking. =head1 ChangeLog $Log$ + Revision 1.2 2005/02/21 12:47:34 othauvin + - avoid error message about non existing media.cfg + Revision 1.1 2005/02/20 21:15:50 othauvin - initials release for managing mandrakelinux distro tree -- cgit v1.2.1