summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-21 14:19:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-21 14:19:21 +0000
commit94812055eb7353778b330e3ac057cb322cdc54b3 (patch)
tree984f0f4426e7dbd40df4ba89e16568c275bd27cd
parent929fa7966aa8b0a619fd50858d51966be2acf2d9 (diff)
downloadurpmi-94812055eb7353778b330e3ac057cb322cdc54b3.tar
urpmi-94812055eb7353778b330e3ac057cb322cdc54b3.tar.gz
urpmi-94812055eb7353778b330e3ac057cb322cdc54b3.tar.bz2
urpmi-94812055eb7353778b330e3ac057cb322cdc54b3.tar.xz
urpmi-94812055eb7353778b330e3ac057cb322cdc54b3.zip
rename conf_file__rel_media into with-dir
(since it will be used in urpmi.cfg too, it needs a less verbose name)
-rw-r--r--t/helper.pm2
-rw-r--r--urpm/cfg.pm6
-rw-r--r--urpm/media.pm2
3 files changed, 5 insertions, 5 deletions
diff --git a/t/helper.pm b/t/helper.pm
index edf787d3..a9d6728c 100644
--- a/t/helper.pm
+++ b/t/helper.pm
@@ -120,7 +120,7 @@ sub create_media_d_cfg {
my $cnt = 1;
foreach my $h (@l) {
my %h = %$h;
- my $section = delete $h{conf_file__rel_media} || $cnt++;
+ my $section = delete $h{'with-dir'} || $cnt++;
print $F "[$section]\n";
print $F "$_ = $h->{$_}\n" foreach keys %$h;
}
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index 634a188d..03175d5f 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -264,7 +264,7 @@ sub load_ini_config_file_raw {
$v = expand_line($v) if !$b_norewrite;
$_ => $v;
} $cfg->Parameters($section);
- { conf_file__rel_media => $section, %h };
+ { 'with-dir' => $section, %h };
} $cfg->Sections ];
}
@@ -293,8 +293,8 @@ sub write_ini_config {
foreach (@$blocks) {
my %h = %$_;
- my $section = delete $h{conf_file__rel_media} || '_';
- $uniq{$section}++ or die "conflicting conf_file__rel_media value\n";
+ my $section = delete $h{'with-dir'} || '_';
+ $uniq{$section}++ or die "conflicting with-dir value\n";
foreach (difference2([ $cfg->Parameters($section) ], [ keys %h ])) {
# remove those options which are no more wanted
diff --git a/urpm/media.pm b/urpm/media.pm
index 3d0f5c3e..4cfd33e4 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -11,7 +11,6 @@ use MDV::Distribconf;
our @PER_MEDIA_OPT = qw(
- conf_file__rel_media
downloader
ignore
key-ids
@@ -28,6 +27,7 @@ our @PER_MEDIA_OPT = qw(
url
verify-rpm
virtual
+ with-dir
with_hdlist
with_synthesis
xml-info