diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-08-31 16:45:36 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-08-31 16:45:36 +0000 |
| commit | 1539de16f61859b061e83b7eb531fd5b4829c64d (patch) | |
| tree | 89d96bdd83d954b08314eef3ec4d4a7ebd42f2f7 | |
| parent | 96fd0d4c8b4add766574d1bb270d492efc804ba8 (diff) | |
| download | rpmdrake-1539de16f61859b061e83b7eb531fd5b4829c64d.tar rpmdrake-1539de16f61859b061e83b7eb531fd5b4829c64d.tar.gz rpmdrake-1539de16f61859b061e83b7eb531fd5b4829c64d.tar.bz2 rpmdrake-1539de16f61859b061e83b7eb531fd5b4829c64d.tar.xz rpmdrake-1539de16f61859b061e83b7eb531fd5b4829c64d.zip | |
(perform_installation,toggle_nodes) adapt to urpmi-7.5
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Rpmdrake/gui.pm | 2 | ||||
| -rw-r--r-- | Rpmdrake/pkg.pm | 6 |
3 files changed, 6 insertions, 4 deletions
@@ -1,3 +1,5 @@ +- adapt to urpmi-7.5 + Version 5.35 - 24 August 2012, Pascal Terjan - display package basenames when signature checking fails diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm index 43e2ba74..39726352 100644 --- a/Rpmdrake/gui.pm +++ b/Rpmdrake/gui.pm @@ -827,7 +827,7 @@ sub toggle_nodes { } if (my @cant = sort(difference2(\@nodes, \@nodes_with_deps))) { - my @ask_unselect = urpm::select::unselected_packages($urpm, $urpm->{state}); + my @ask_unselect = urpm::select::unselected_packages($urpm->{state}); my @reasons = map { my $cant = $_; my $unsel = find { $_ eq $cant } @ask_unselect; diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index c8073d09..4a21b538 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -708,7 +708,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( my @to_install = @{$urpm->{depslist}}[keys %{$state->{selected}}]; my @pkgs = map { scalar($_->fullname) } sort(grep { $_->flag_selected } @to_install); - @{$urpm->{ask_remove}} = sort(urpm::select::removed_packages($urpm, $urpm->{state})); + @{$urpm->{ask_remove}} = sort(urpm::select::removed_packages($urpm->{state})); my @to_remove = map { if_($pkgs->{$_}{selected} && !$pkgs->{$_}{pkg}->flag_upgrade, $pkgs->{$_}{urpm_name}) } keys %$pkgs; my $r = format_list(map { scalar(urpm::select::translate_why_removed_one($urpm, $urpm->{state}, $_)) } @to_remove); @@ -774,7 +774,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( }; # FIXME: sometimes state is lost: - my @ask_unselect = urpm::select::unselected_packages($urpm, $state); + my @ask_unselect = urpm::select::unselected_packages($state); # fix flags for orphan computing: foreach (keys %{$state->{selected}}) { @@ -782,7 +782,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( $pkg->set_flag_requested($saved_flags{$pkg->id}); } my $exit_code = - urpm::main_loop::run($urpm, $state, 1, \@ask_unselect, $requested, + urpm::main_loop::run($urpm, $state, 1, \@ask_unselect, { completed => sub { # explicitly destroy the progress window when it's over; we may |