aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-04-30 16:23:13 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-04-30 16:23:13 +0000
commit588bf2dabd7af5948062b115895cbbd53896e892 (patch)
tree5a7d15de303ca6a98311234581ca638ae4a33387
parent5fbe3ef7ee6553bc647952742cae27886365ee2b (diff)
downloadrpmdrake-588bf2dabd7af5948062b115895cbbd53896e892.tar
rpmdrake-588bf2dabd7af5948062b115895cbbd53896e892.tar.gz
rpmdrake-588bf2dabd7af5948062b115895cbbd53896e892.tar.bz2
rpmdrake-588bf2dabd7af5948062b115895cbbd53896e892.tar.xz
rpmdrake-588bf2dabd7af5948062b115895cbbd53896e892.zip
In the Software Media Manager, in the sub-window to choose the media
to be updated, don't list the disabled media.
-rwxr-xr-xedit-urpm-sources.pl7
-rw-r--r--rpmdrake.pm54
2 files changed, 44 insertions, 17 deletions
diff --git a/edit-urpm-sources.pl b/edit-urpm-sources.pl
index 1e263b8d..9746d49e 100755
--- a/edit-urpm-sources.pl
+++ b/edit-urpm-sources.pl
@@ -646,7 +646,12 @@ sub mainwindow {
clicked => sub { edit_callback() and $reread_media->() }),
gtksignal_connect(Gtk2::Button->new(but(N("Add..."))),
clicked => sub { add_callback() and $reread_media->(); }),
- gtksignal_connect(Gtk2::Button->new(but(N("Update..."))), clicked => \&update_callback),
+ gtksignal_connect(
+ Gtk2::Button->new(but(N("Update..."))),
+ clicked => sub {
+ update_callback() and $reread_media->();
+ },
+ ),
gtksignal_connect(Gtk2::Button->new(but(N("Manage keys..."))), clicked => \&keys_callback),
gtksignal_connect(Gtk2::Button->new(but(N("Proxy..."))), clicked => \&proxy_callback),
gtksignal_connect(Gtk2::Button->new(but(N("Parallel..."))), clicked => \&parallel_callback))),
diff --git a/rpmdrake.pm b/rpmdrake.pm
index baf5b820..9027f1d0 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -360,7 +360,7 @@ by Mandrake Linux Official Updates.")), return '';
$model and $w->{retval} = { sel => $model->get($iter, 0) };
}
Gtk2->main_quit })
- } ([ N("Cancel"), 0 ], [ N("Ok"), 1 ] )),
+ } [ N("Cancel"), 0 ], [ N("Ok"), 1 ]),
));
my %roots;
$tree_model->append_set($roots{$_->{land}} ||= $tree_model->append_set(undef, [ 0 => $_->{land} ]),
@@ -456,7 +456,7 @@ later.",
sub update_sources_check {
my ($urpm, $options, $error_msg, @media) = @_;
my @error_msgs;
- local $urpm->{fatal} = sub { push @error_msgs, to_utf8($_[1]); goto fatal_error; };
+ local $urpm->{fatal} = sub { push @error_msgs, to_utf8($_[1]); goto fatal_error };
local $urpm->{error} = sub { push @error_msgs, to_utf8($_[0]) };
update_sources($urpm, %$options, noclean => 1);
fatal_error:
@@ -473,26 +473,48 @@ sub update_sources_interactive {
$w->{rwindow}->set_position($options{transient} ? 'center_on_parent' : 'center_always');
my @buttons;
my @media;
- gtkadd($w->{window},
- gtkpack__(Gtk2::VBox->new(0,5),
- Gtk2::Label->new(N("Select the media you wish to update:")),
- (@buttons = map { Gtk2::CheckButton->new($_->{name}) } @{$urpm->{media}}),
- Gtk2::HSeparator->new,
- gtkpack(create_hbox(),
- gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { $w->{retval} = 0; Gtk2->main_quit }),
- gtksignal_connect(Gtk2::Button->new(N("Update")), clicked => sub {
- $w->{retval} = any { $_->get_active } @buttons;
- @media = map_index { if_($_->get_active, $urpm->{media}[$::i]{name}) } @buttons;
- Gtk2->main_quit;
- }),
- )));
+ gtkadd(
+ $w->{window},
+ gtkpack__(
+ Gtk2::VBox->new(0,5),
+ Gtk2::Label->new(N("Select the media you wish to update:")),
+ (
+ @buttons = map {
+ Gtk2::CheckButton->new($_->{name})
+ } grep {
+ ! $_->{ignore}
+ } @{$urpm->{media}}
+ ),
+ Gtk2::HSeparator->new,
+ gtkpack(
+ create_hbox(),
+ gtksignal_connect(
+ Gtk2::Button->new(N("Cancel")),
+ clicked => sub { $w->{retval} = 0; Gtk2->main_quit },
+ ),
+ gtksignal_connect(
+ Gtk2::Button->new(N("Update")),
+ clicked => sub {
+ $w->{retval} = any { $_->get_active } @buttons;
+ @media = map_index { if_($_->get_active, $urpm->{media}[$::i]{name}) } @buttons;
+ Gtk2->main_quit;
+ },
+ ),
+ )
+ )
+ );
if ($w->main) {
foreach (@{$urpm->{media}}) { #- force ignored media to be returned alive (forked from urpmi.updatemedia...)
$_->{modified} and delete $_->{ignore};
}
standalone::explanations("Updating media @media");
$urpm->select_media(@media);
- update_sources_check($urpm, {}, N_("Unable to update medium; it will be automatically disabled.\n\nErrors:\n%s"), @media);
+ update_sources_check(
+ $urpm,
+ {},
+ N_("Unable to update medium; it will be automatically disabled.\n\nErrors:\n%s"),
+ @media,
+ );
return 1;
}
return 0;