From 14abfdf01bfa2e0872a85ea7ce022d44a6e29fb7 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 23 Feb 2008 21:31:09 +0000
Subject: - all tools:   o handle mirrorlist     (need perl-Zone-TimeInfo
 patched for geolocalisation)

---
 urpm/cfg.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'urpm/cfg.pm')

diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index 03175d5f..3283c6e7 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -140,11 +140,13 @@ sub load_config_raw {
 		$err = N("medium `%s' is defined twice, aborting", $name);
 		return;
 	    }
-	    $block = { name => $name, url => $url };
+	    $block = { name => $name, $url ? (url => $url) : () };
 	} elsif (/^(hdlist
 	  |list
 	  |with_hdlist
 	  |with_synthesis
+	  |with-dir
+          |mirrorlist
 	  |media_info_dir
 	  |removable
 	  |md5sum
@@ -294,7 +296,7 @@ sub write_ini_config {
     foreach (@$blocks) {
 	my %h = %$_;
 	my $section = delete $h{'with-dir'} || '_';
-	$uniq{$section}++ or die "conflicting with-dir value\n";
+	$uniq{$section}++ or die "conflicting with-dir value $section\n";
 
 	foreach (difference2([ $cfg->Parameters($section) ], [ keys %h ])) {
 	    # remove those options which are no more wanted
-- 
cgit v1.2.1