diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-01-21 10:58:56 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-01-21 10:58:56 +0000 |
| commit | 9bc390516a520c7588787a95e15426110372b7ad (patch) | |
| tree | 7922bd050670aa64d55035be10b389a747f6da89 | |
| parent | 76eaefe65a3b2b13db08de0571e2c3e157c35fec (diff) | |
| download | rpmdrake-9bc390516a520c7588787a95e15426110372b7ad.tar rpmdrake-9bc390516a520c7588787a95e15426110372b7ad.tar.gz rpmdrake-9bc390516a520c7588787a95e15426110372b7ad.tar.bz2 rpmdrake-9bc390516a520c7588787a95e15426110372b7ad.tar.xz rpmdrake-9bc390516a520c7588787a95e15426110372b7ad.zip | |
fix "update sources" dialog which didn't update the asked mediums
| -rw-r--r-- | rpmdrake.pm | 9 | ||||
| -rw-r--r-- | rpmdrake.spec | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/rpmdrake.pm b/rpmdrake.pm index aa4dbca8..b99c24f9 100644 --- a/rpmdrake.pm +++ b/rpmdrake.pm @@ -337,7 +337,7 @@ by Mandrake Linux Official Updates.")), return ''; sub update_sources { my ($urpm, %opts) = @_; my $w = ugtk2->new(N("Update source(s)"), grab => 1, center => 1, %opts); - my (@buttons, @sources_to_update); + my @buttons; gtkadd($w->{window}, gtkpack__(Gtk2::VBox->new(0,5), Gtk2::Label->new(N("Select the source(s) you wish to update:")), @@ -345,13 +345,12 @@ sub update_sources { Gtk2::HSeparator->new, gtkpack(create_hbox(), gtksignal_connect(Gtk2::Button->new(N("Update")), clicked => sub { - $w->{retval} = 1; - @sources_to_update = grep { $_->get_active } @buttons; + $w->{retval} = any { $_->get_active } @buttons; + each_index { $_->get_active and $urpm->select_media($urpm->{media}[$::i]{name}) } @buttons; Gtk2->main_quit; }), gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { $w->{retval} = 0; Gtk2->main_quit })))); - if ($w->main && @sources_to_update) { - each_index { $urpm->select_media($urpm->{media}[$::i]{name}) } @sources_to_update; + if ($w->main) { foreach (@{$urpm->{media}}) { #- force ignored media to be returned alive (forked from urpmi.updatemedia...) $_->{modified} and delete $_->{ignore}; } diff --git a/rpmdrake.spec b/rpmdrake.spec index 1860af0f..7645fb0b 100644 --- a/rpmdrake.spec +++ b/rpmdrake.spec @@ -8,7 +8,7 @@ %define name rpmdrake %define version 2.1 -%define release 2mdk +%define release 3mdk Name: %{name} Version: %{version} @@ -16,7 +16,7 @@ Release: %{release} License: GPL Source0: rpmdrake.tar.bz2 Summary: Mandrake Linux graphical front end for choosing packages for installion/removal -Requires: perl-MDK-Common urpmi >= 4.0 perl-URPM >= 0.60 drakxtools >= 1.1.9-36mdk grpmi >= 9.0 rpmtools >= 4.5 +Requires: perl-MDK-Common >= 1.0.4-13mdk urpmi >= 4.0 perl-URPM >= 0.60 drakxtools >= 1.1.9-36mdk grpmi >= 9.0 rpmtools >= 4.5 Requires: perl-GTK2 > 0.0.cvs.2003.01.08.1 BuildRequires: curl-devel rpm-devel gettext openssl-devel perl-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot @@ -116,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/*.pm %changelog +* Tue Jan 21 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-3mdk +- rpmdrake: + - fix "update sources" dialog which didn't update the asked mediums + * Fri Jan 10 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-2mdk - grpmi: - verify all signatures at the end of all downloads |