From 31b18e675e75fa9e71b317960bc9132b1452a35f Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Fri, 15 Jan 2010 16:22:17 +0000 Subject: don't crash when parsing an invalid media.cfg file in /etc/urpmi/mediacfg.d --- NEWS | 2 ++ urpm/media.pm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 533a58ff..5a5ce824 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- don't crash when parsing an invalid media.cfg file in /etc/urpmi/mediacfg.d + Version 6.33 - 12 January 2010 - invalidate mirror list cache when it's an old format (ie one which does not diff --git a/urpm/media.pm b/urpm/media.pm index c401eb46..3274b742 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -170,7 +170,7 @@ sub _read_config__read_media_info { my $media_cfg = $media_dir . '/media.cfg'; my $distribconf = MDV::Distribconf->new($media_cfg, undef) or next; $distribconf->settree('mandriva'); - $distribconf->parse_mediacfg($media_cfg); + $distribconf->parse_mediacfg($media_cfg) or next; if (open(my $URLS, '<', $media_dir . '/url')) { local $_; -- cgit v1.2.1