aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-01 14:00:52 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-01 14:00:52 +0000
commit72778b215155f8c7b02647c15d18ca6dc685607a (patch)
treeb0f6c9947adec13498ee1878a3a5df55346d8e77
parent550dcaf2b1b8272a95f85e7af4cfd126d1c29c8e (diff)
downloadrpmdrake-72778b215155f8c7b02647c15d18ca6dc685607a.tar
rpmdrake-72778b215155f8c7b02647c15d18ca6dc685607a.tar.gz
rpmdrake-72778b215155f8c7b02647c15d18ca6dc685607a.tar.bz2
rpmdrake-72778b215155f8c7b02647c15d18ca6dc685607a.tar.xz
rpmdrake-72778b215155f8c7b02647c15d18ca6dc685607a.zip
(edit_callback) enable to edit mirrorlist media
-rw-r--r--NEWS1
-rw-r--r--Rpmdrake/edit_urpm_sources.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 2ac5c4e7..2702eb47 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
o add an "Add media" menu item in order to still able to manually
choose mirror
o default to use mirrorlist
+ o enable to edit mirrorlist media
Version 4.21 - 30 September 2008, Thierry Vignaud
diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm
index 6e382bf5..2071e13d 100644
--- a/Rpmdrake/edit_urpm_sources.pm
+++ b/Rpmdrake/edit_urpm_sources.pm
@@ -473,7 +473,7 @@ sub edit_callback() {
0, gtknew('Title2', label => N("Editing medium \"%s\":", $medium->{name})),
0, create_packtable(
{},
- [ gtknew('Label_Left', text => N("URL:")), $url_entry = gtkentry($verbatim_medium->{url}) ],
+ [ gtknew('Label_Left', text => N("URL:")), $url_entry = gtkentry($verbatim_medium->{url} || $verbatim_medium->{mirrorlist}) ],
[ gtknew('Label_Left', text => N("Downloader:")),
my $download_combo = Gtk2::ComboBox->new_with_strings([ urpm::download::available_ftp_http_downloaders() ],
$verbatim_medium->{downloader} || '') ],
@@ -517,7 +517,7 @@ sub edit_callback() {
urpm::media::select_media($urpm, $name);
if (my ($media) = grep { $_->{name} eq $name } @{$urpm->{media}}) {
put_in_hash($media, {
- url => $url,
+ ($verbatim_medium->{mirrorlist} ? 'mirrorlist' : 'url') => $url,
name => $name,
update => $update,
proxy => $saved_proxy,