From 94812055eb7353778b330e3ac057cb322cdc54b3 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 21 Feb 2008 14:19:21 +0000
Subject: rename conf_file__rel_media into with-dir (since it will be used in
 urpmi.cfg too, it needs a less verbose name)

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

(limited to 'urpm')

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
-- 
cgit v1.2.1