summaryrefslogtreecommitdiffstats
path: root/urpm/cfg.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-23 21:31:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-23 21:31:09 +0000
commit14abfdf01bfa2e0872a85ea7ce022d44a6e29fb7 (patch)
tree12bc24416cea0e35035e76da0e73a473092b6f69 /urpm/cfg.pm
parentfac2e70e4020fbd9a545f50e358537a4116c0df1 (diff)
downloadurpmi-14abfdf01bfa2e0872a85ea7ce022d44a6e29fb7.tar
urpmi-14abfdf01bfa2e0872a85ea7ce022d44a6e29fb7.tar.gz
urpmi-14abfdf01bfa2e0872a85ea7ce022d44a6e29fb7.tar.bz2
urpmi-14abfdf01bfa2e0872a85ea7ce022d44a6e29fb7.tar.xz
urpmi-14abfdf01bfa2e0872a85ea7ce022d44a6e29fb7.zip
- all tools:
o handle mirrorlist (need perl-Zone-TimeInfo patched for geolocalisation)
Diffstat (limited to 'urpm/cfg.pm')
-rw-r--r--urpm/cfg.pm6
1 files changed, 4 insertions, 2 deletions
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