diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-08-31 16:44:20 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-08-31 16:44:20 +0000 |
| commit | 5a5cfaa41a0fe979a1cab1fa68d5edbb98bc5688 (patch) | |
| tree | 375273c7b72ec9387191048e17ec5ffd4c18cb9a | |
| parent | 303cf41e82e8785d3d9ea09ddc11df84db5e9c18 (diff) | |
| download | drakx-5a5cfaa41a0fe979a1cab1fa68d5edbb98bc5688.tar drakx-5a5cfaa41a0fe979a1cab1fa68d5edbb98bc5688.tar.gz drakx-5a5cfaa41a0fe979a1cab1fa68d5edbb98bc5688.tar.bz2 drakx-5a5cfaa41a0fe979a1cab1fa68d5edbb98bc5688.tar.xz drakx-5a5cfaa41a0fe979a1cab1fa68d5edbb98bc5688.zip | |
(_install_raw,_resolve_requested_and_check) adapt to urpmi-7.5
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 0ed4d0d85..913d79f67 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- adapt to urpmi-7.5 + Version 14.35 - 30 August 2012 - adapt to usbfs death diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index bb12e9cac..620e26b99 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -292,7 +292,7 @@ sub _resolve_requested_and_check { my $error; if (find { !exists $state->{selected}{$_} } keys %$requested) { - my @rejected = urpm::select::unselected_packages($packages, $state); + my @rejected = urpm::select::unselected_packages($state); $error = urpm::select::translate_why_unselected($packages, $state, @rejected); log::l("ERROR: selection failed: $error"); } @@ -825,7 +825,7 @@ sub _install_raw { log::l("rpm transactions start"); - my $exit_code = urpm::main_loop::run($packages, $packages->{state}, undef, undef, undef, { + my $exit_code = urpm::main_loop::run($packages, $packages->{state}, undef, undef, { open_helper => $callback, close_helper => sub { my ($db, $packages, $_type, $id) = @_; |