Some options don't belong to urpmi.cfg

1 files changed, 21 insertions, 21 deletions

diff --git a/urpm.pm b/urpm.pm
index f212c809..2f8ac05d 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -26,25 +26,6 @@ BEGIN {
     }
 }
 
-#- list of options defined for each media
-our @PER_MEDIA_OPT = qw(
-    downloader 
-    hdlist
-    ignore
-    key-ids
-    list
-    md5sum    
-    noreconfigure
-    priority
-    priority-upgrade
-    removable
-    synthesis
-    update
-    verify-rpm 
-    virtual
-    with_hdlist
-);
-
 #- create a new urpm object.
 sub new {
     my ($class) = @_;
@@ -182,7 +163,24 @@ sub read_config {
     #- per-media options
     foreach my $m (grep { $_ ne '' } keys %$config) {
 	my $medium = { name => $m, clear_url => $config->{$m}{url} };
-	defined $config->{$m}{$_} and $medium->{$_} = $config->{$m}{$_} foreach @PER_MEDIA_OPT;
+	foreach my $opt (qw(
+	    downloader
+	    hdlist
+	    ignore
+	    key-ids
+	    list
+	    md5sum
+	    noreconfigure
+	    priority
+	    removable
+	    synthesis
+	    update
+	    verify-rpm
+	    virtual
+	    with_hdlist
+	)) {
+	    defined $config->{$m}{$opt} and $medium->{$opt} = $config->{$m}{$opt};
+	}
 	$urpm->probe_medium($medium, %options) and push @{$urpm->{media}}, $medium;
     }
 
@@ -381,7 +379,9 @@ sub write_config {
     foreach my $medium (@{$urpm->{media}}) {
 	my $medium_name = $medium->{name};
 	$config->{$medium_name}{url} = $medium->{clear_url};
-	defined $medium->{$_} and $config->{$medium_name}{$_} = $medium->{$_} foreach @PER_MEDIA_OPT;
+	foreach (qw(hdlist with_hdlist list removable key-ids priority priority-upgrade update ignore synthesis virtual)) {
+	    defined $medium->{$_} and $config->{$medium_name}{$_} = $medium->{$_};
+	}
     }
     urpm::cfg::dump_config($urpm->{config}, $config)
 	or $urpm->{fatal}(6, N("unable to write config file [%s]", $urpm->{config}));