diff options
author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> | 2006-10-03 13:14:53 +0000 |
---|---|---|
committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> | 2006-10-03 13:14:53 +0000 |
commit | 47c40b1121d0a764459cc9ce3709febda4707028 (patch) | |
tree | 853b327ce946b92a61e9b51507775bed579ab7a4 /urpm.pm | |
parent | e367ab8deb3c959869de6c4f5ce2178d585c2aa6 (diff) | |
download | urpmi-47c40b1121d0a764459cc9ce3709febda4707028.tar urpmi-47c40b1121d0a764459cc9ce3709febda4707028.tar.gz urpmi-47c40b1121d0a764459cc9ce3709febda4707028.tar.bz2 urpmi-47c40b1121d0a764459cc9ce3709febda4707028.tar.xz urpmi-47c40b1121d0a764459cc9ce3709febda4707028.zip |
Don't remove "downloader" setting from per-media config when updating media
(bug #26257)
Diffstat (limited to 'urpm.pm')
-rw-r--r-- | urpm.pm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -85,7 +85,7 @@ sub sync_webfetch { my $option_downloader = $urpm->{options}{downloader}; #- cmd-line switch if (!$option_downloader && $options->{media}) { #- per-media config (my $m) = grep { $_->{name} eq $options->{media} } @{$urpm->{media}}; - ref $m && $m->{downloader} and $option_downloader = $m->{downloader}; + ref $m && defined $m->{downloader} and $option_downloader = $m->{downloader}; } #- global config !$option_downloader && exists $urpm->{global_config}{downloader} @@ -406,7 +406,7 @@ sub write_config { next if $medium->{external}; my $medium_name = $medium->{name}; $config->{$medium_name}{url} = $medium->{clear_url}; - foreach (qw(hdlist with_hdlist list removable key-ids priority priority-upgrade update noreconfigure static ignore synthesis virtual)) { + foreach (qw(hdlist with_hdlist list removable key-ids priority priority-upgrade update noreconfigure static ignore synthesis virtual downloader)) { defined $medium->{$_} and $config->{$medium_name}{$_} = $medium->{$_}; } } |