diff options
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | t/01compile.t | 2 | ||||
| -rwxr-xr-x | urpm/main_loop.pm | 284 | ||||
| -rwxr-xr-x | urpmi | 249 |
5 files changed, 308 insertions, 231 deletions
@@ -203,6 +203,7 @@ urpm/get_pkgs.pm urpm/install.pm urpm/ldap.pm urpm/lock.pm +urpm/main_loop.pm urpm/md5sum.pm urpm/media.pm urpm/msg.pm @@ -1,3 +1,6 @@ +- urpmi + o move some code to new modules urpm::main_loop to share it with rpmdrake + Version 4.9.29 - 9 August 2007, by Pascal "Pixel" Rigaux - urpmi diff --git a/t/01compile.t b/t/01compile.t index 0f0d5143..cb744cc1 100644 --- a/t/01compile.t +++ b/t/01compile.t @@ -2,7 +2,7 @@ use strict; use warnings; -use Test::More tests => 20; +use Test::More tests => 21; for my $module (glob("urpm/*.pm")) { $module =~ s,/,::,g; diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm new file mode 100755 index 00000000..b8716801 --- /dev/null +++ b/urpm/main_loop.pm @@ -0,0 +1,284 @@ +package urpm::main_loop; + +# $Id$ + +#- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 MandrakeSoft SA +#- Copyright (C) 2005-2007 Mandriva SA +#- +#- This program is free software; you can redistribute it and/or modify +#- it under the terms of the GNU General Public License as published by +#- the Free Software Foundation; either version 2, or (at your option) +#- any later version. +#- +#- This program is distributed in the hope that it will be useful, +#- but WITHOUT ANY WARRANTY; without even the implied warranty of +#- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#- GNU General Public License for more details. +#- +#- You should have received a copy of the GNU General Public License +#- along with this program; if not, write to the Free Software +#- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +use strict; +use urpm; +use urpm::args; +use urpm::msg; +use urpm::install; +use urpm::media; +use urpm::select; +use urpm::get_pkgs; +use urpm::signature; +use urpm::util qw(untaint difference2 member partition); + +# locking is left to callers +sub run { + my ($urpm, $state, $something_was_to_be_done, $ask_unselect, $requested, $callbacks) = @_; + + #- global boolean options + my ($auto_select, $no_install, $install_src, $clean, $noclean, $force, $parallel, $test) = + ($::auto_select, $::no_install, $::install_src, $::clean, $::noclean, $::force, $::parallel, $::test); + +my ($local_sources, $list) = urpm::get_pkgs::selected2list($urpm, + $state->{selected}, + clean_all => $clean, + clean_other => !$noclean && $urpm->{options}{'pre-clean'}, +); +unless ($local_sources || $list) { + $urpm->{fatal}(3, N("unable to get source packages, aborting")); +} + +my %sources = %$local_sources; +my %error_sources; + +$callbacks->{pre_removable} and $callbacks->{pre_removable}->(); +urpm::removable::copy_packages_of_removable_media($urpm, + $list, \%sources, + $callbacks->{copy_removable}); +$callbacks->{post_removable} and $callbacks->{post_removable}->(); + +#- now create transaction just before installation, this will save user impression of slowness. +#- split of transaction should be disabled if --test is used. +urpm::install::create_transaction($urpm, $state, + nodeps => $urpm->{options}{'allow-nodeps'} || $urpm->{options}{'allow-force'}, + split_level => $urpm->{options}{'split-level'}, + split_length => !$test && $urpm->{options}{'split-length'}); + +my ($ok, $nok) = (0, 0); +my @errors; + +foreach my $set (@{$state->{transaction} || []}) { + my (@transaction_list, %transaction_sources); + + #- put a blank line to separate with previous transaction or user question. + print "\n" if $options{verbose} >= 0; + + #- prepare transaction... + urpm::install::prepare_transaction($urpm, $set, $list, \%sources, \@transaction_list, \%transaction_sources); + + #- first, filter out what is really needed to download for this small transaction. + urpm::get_pkgs::download_packages_of_distant_media($urpm, + \@transaction_list, + \%transaction_sources, + \%error_sources, + quiet => $options{verbose} < 0, + callback => $callbacks->{trans_log}, + ); + $callbacks->{post_download} and $callbacks->{post_download}->(); + my %transaction_sources_install = %{$urpm->extract_packages_to_install(\%transaction_sources, $state) || {}}; + $callbacks->{post_extract} and $callbacks->{post_extract}->($set, \%transaction_sources, \%transaction_sources_install); + + if (!$force && ($urpm->{options}{'verify-rpm'} || grep { $_->{'verify-rpm'} } @{$urpm->{media}})) { + $callbacks->{pre_check_sig} and $callbacks->{pre_check_sig}->(); + # CHECK ME: rpmdrake passed "basename => 1" option: + my @bad_signatures = urpm::signature::check($urpm, \%transaction_sources_install, \%transaction_sources, + callback => $callbacks->{check_sig} + ); + + if (@bad_signatures) { + my $msg = @bad_signatures == 1 ? + N("The following package has bad signature") + : N("The following packages have bad signatures"); + my $msg2 = N("Do you want to continue installation ?"); + my $p = join "\n", @bad_signatures; + $callbacks->{bad_signature}->("$msg:\n$p\n", $msg2); + } + } + + #- install source package only (whatever the user is root or not, but use rpm for that). + if ($install_src) { + if (my @l = grep { /\.src\.rpm$/ } values %transaction_sources_install, values %transaction_sources) { + my $rpm_opt = $options{verbose} >= 0 ? 'vh' : ''; + system("rpm", "-i$rpm_opt", @l, ($urpm->{root} ? ("--root", $urpm->{root}) : @{[]})); + #- Warning : the following message is parsed in urpm::parallel_* + if ($?) { + print N("Installation failed"), "\n"; + ++$nok; + } + } + next; + } + + next if $no_install; + + #- clean to remove any src package now. + foreach (\%transaction_sources_install, \%transaction_sources) { + foreach my $id (keys %$_) { + my $pkg = $urpm->{depslist}[$id] or next; + $pkg->arch eq 'src' and delete $_->{$id}; + } + } + + if (keys(%transaction_sources_install) || keys(%transaction_sources)) { + if ($parallel) { + print N("distributing %s", join(' ', values %transaction_sources_install, values %transaction_sources)), "\n"; + #- no remove are handle here, automatically done by each distant node. + $urpm->{log}("starting distributed install"); + $urpm->{parallel_handler}->parallel_install( + $urpm, + [ keys %{$state->{rejected} || {}} ], \%transaction_sources_install, \%transaction_sources, + test => $test, + excludepath => $urpm->{options}{excludepath}, excludedocs => $urpm->{options}{excludedocs}, + ); + } else { + if ($options{verbose} >= 0) { + my @packnames = (values %transaction_sources_install, values %transaction_sources); + (my $common_prefix) = $packnames[0] =~ m!^(.*)/!; + if (length($common_prefix) && @packnames == grep { m!^\Q$common_prefix/! } @packnames) { + #- there's a common prefix, simplify message + print N("installing %s from %s", join(' ', map { s!.*/!!; $_ } @packnames), $common_prefix), "\n"; + } else { + print N("installing %s", join "\n", @packnames), "\n"; + } + } + my $to_remove = $urpm->{options}{'allow-force'} ? [] : $set->{remove} || []; + bug_log(scalar localtime(), " ", join(' ', values %transaction_sources_install, values %transaction_sources), "\n"); + $urpm->{log}("starting installing packages"); + my %install_options_common = ( + test => $test, + excludepath => $urpm->{options}{excludepath}, + excludedocs => $urpm->{options}{excludedocs}, + repackage => $urpm->{options}{repackage}, + post_clean_cache => $urpm->{options}{'post-clean'}, + oldpackage => $state->{oldpackage}, + nosize => $urpm->{options}{ignoresize}, + ignorearch => $urpm->{options}{ignorearch}, + noscripts => $urpm->{options}{noscripts}, + callback_inst => $callbacks->{inst}, + callback_trans => $callbacks->{trans}, + ); + my @l = urpm::install::install($urpm, + $to_remove, + \%transaction_sources_install, \%transaction_sources, + %install_options_common, + ); + if (@l) { + #- Warning : the following message is parsed in urpm::parallel_* + my $msg = N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l) . "\n"; + if ($urpm->{options}{auto} || !$urpm->{options}{'allow-nodeps'} && !$urpm->{options}{'allow-force'}) { + print $msg; + ++$nok; + ++$urpm->{logger_id}; + push @errors, @l; + } else { + $callbacks->{ask_yes_or_no}->(N("Installation failed"), + $msg . N("Try installation without checking dependencies? (y/N) ")) or ++$nok, next; + $urpm->{log}("starting installing packages without deps"); + @l = urpm::install::install($urpm, + $to_remove, + \%transaction_sources_install, \%transaction_sources, + nodeps => 1, + %install_options_common, + ); + if (@l) { + #- Warning : the following message is parsed in urpm::parallel_* + my $msg = N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l) . "\n"; + if (!$urpm->{options}{'allow-force'}) { + print $msg; + ++$nok; + ++$urpm->{logger_id}; + push @errors, @l; + } else { + $callbacks->{ask_yes_or_no}->(N("Installation failed"), + $msg . N("Try harder to install (--force)? (y/N) ")) or ++$nok, next; + $urpm->{log}("starting force installing packages without deps"); + @l = urpm::install::install($urpm, + $to_remove, + \%transaction_sources_install, \%transaction_sources, + nodeps => 1, force => 1, + %install_options_common, + ); + if (@l) { + #- Warning : the following message is parsed in urpm::parallel_* + print N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l), "\n"; + ++$nok; + ++$urpm->{logger_id}; + push @errors, @l; + } else { + ++$ok; + } + } + } else { + ++$ok; + } + } + } else { + ++$ok; + } + } + } +} + +$callbacks->{completed} and $callbacks->{completed}->(); + +#- keep a track of error code. +my $exit_code = 0; +if (values %error_sources) { + $callbacks->{missing_files_summary} and $callbacks->{missing_files_summary}->(\%error_sources); + #- Warning : the following message is parsed in urpm::parallel_* + print N("Installation failed, some files are missing:\n%s\nYou may want to update your urpmi database", + join "\n", map { s|([^:]*://[^/:\@]*:)[^/:\@]*(\@.*)|$1xxxx$2|; " $_" } values %error_sources), "\n"; + $exit_code = 10; +} +if ($nok) { + $callbacks->{trans_error_summary} and $callbacks->{trans_error_summary}->($nok, \@errors); + $nok > 1 and print P("%d installation transaction failed", + "%d installation transactions failed", $nok, $nok) . (@errors && ":\n" . join("\n", map { "\t$_" } @errors)), "\n"; + if ($exit_code) { + $exit_code = $ok ? 13 : 14; + } else { + $exit_code = $ok ? 11 : 12; + } +} else { + $callbacks->{success_summary} and $callbacks->{success_summary}->(); + if ($test) { + #- Warning : the following message is parsed in urpm::parallel_* + print N("Installation is possible"), "\n"; + } elsif ($something_was_to_be_done || $auto_select) { + if (@{$state->{transaction} || []} == 0 && @$ask_unselect == 0) { + if ($options{verbose} >= 0) { + if ($auto_select) { + print N("Packages are up to date"), "\n"; + } else { + my @pkgs = map { $urpm->{depslist}[$_] } map { split /\|/ } keys %$requested; + my ($installed, $error) = partition { $_->flag_installed } @pkgs; + my @installed = map { scalar $_->fullname } @$installed; + my @error = map { scalar $_->fullname } @$error; + my @msg1 = @installed == 0 ? () : + @installed == 1 ? + N("Package %s is already installed", join(', ', @installed)) : + N("Packages %s are already installed", join(', ', @installed)); + my @msg2 = @error == 0 ? () : + @error == 1 ? + N("Package %s can not be installed", join(', ', @error)) : + N("Packages %s can not be installed", join(', ', @error)); + print join("\n", @msg1, @msg2, ''); + } + } + $exit_code = 15 if our $expect_install; + } + } +} + $exit_code; +} + +1; @@ -23,12 +23,10 @@ use strict; use urpm; use urpm::args; use urpm::msg; -use urpm::install; use urpm::media; use urpm::select; -use urpm::get_pkgs; -use urpm::signature; use urpm::util qw(untaint difference2 member partition); +use urpm::main_loop; #- contains informations to parse installed system. my $urpm = new urpm; @@ -606,21 +604,10 @@ if (@root_only) { message_input("$msg\n$p\n$msg2" . N(" (Y/n) "), $force && $yesexpr, boolean => 1) =~ /[$noexpr]/ and exit 0; } -my ($local_sources, $list) = urpm::get_pkgs::selected2list($urpm, - $state->{selected}, - clean_all => $clean, - clean_other => !$noclean && $urpm->{options}{'pre-clean'}, -); -unless ($local_sources || $list) { - $urpm->{fatal}(3, N("unable to get source packages, aborting")); -} - -my %sources = %$local_sources; -my %error_sources; - -urpm::removable::copy_packages_of_removable_media($urpm, - $list, \%sources, - (!$urpm->{options}{auto} || $allow_medium_change) && sub { +my $exit_code = urpm::main_loop::run($urpm, $state, + @names || @src_names || @files || @src_files, + \@ask_unselect, \%requested, { + (!$urpm->{options}{auto} || $allow_medium_change ? (copy_removable => sub { my $msg = N("Please insert the medium named \"%s\" on device [%s]", $_[0], $_[1]); my $msg2 = N("Press Enter when ready..."); if ($ENV{DISPLAY} && $::gui) { @@ -631,226 +618,28 @@ urpm::removable::copy_packages_of_removable_media($urpm, } } return defined message_input("$msg\n$msg2 "); - }); - -#- now create transaction just before installation, this will save user impression of slowness. -#- split of transaction should be disabled if --test is used. -urpm::install::create_transaction($urpm, $state, - nodeps => $urpm->{options}{'allow-nodeps'} || $urpm->{options}{'allow-force'}, - split_level => $urpm->{options}{'split-level'}, - split_length => !$test && $urpm->{options}{'split-length'}); - -my ($ok, $nok) = (0, 0); -my @errors; - -foreach my $set (@{$state->{transaction} || []}) { - my (@transaction_list, %transaction_sources); - - #- put a blank line to separate with previous transaction or user question. - print "\n" if $options{verbose} >= 0; - - #- prepare transaction... - urpm::install::prepare_transaction($urpm, $set, $list, \%sources, \@transaction_list, \%transaction_sources); - - #- first, filter out what is really needed to download for this small transaction. - urpm::get_pkgs::download_packages_of_distant_media($urpm, - \@transaction_list, - \%transaction_sources, - \%error_sources, - quiet => $options{verbose} < 0, - callback => sub { + }) : ()), + trans_log => sub { # my ($mode, $file, $percent, $total, $eta, $speed) = @_; goto &urpm::download::sync_logger; - }, - ); - my %transaction_sources_install = %{$urpm->extract_packages_to_install(\%transaction_sources, $state) || {}}; - - if (!$force && ($urpm->{options}{'verify-rpm'} || grep { $_->{'verify-rpm'} } @{$urpm->{media}})) { - my @bad_signatures = urpm::signature::check($urpm, \%transaction_sources_install, \%transaction_sources); - - if (@bad_signatures) { - my $msg = @bad_signatures == 1 ? - N("The following package has bad signature") - : N("The following packages have bad signatures"); - my $msg2 = N("Do you want to continue installation ?"); - my $p = join "\n", @bad_signatures; + }, + bad_signature => sub { + my ($msg, $msg2) = @_; #- rurpmi always abort here if ($urpm->{options}{auto} || $restricted) { - print "$msg:\n$p\n\n"; + print "$msg\n"; exit 1; } else { my $yesexpr = N("Yy"); - message_input("$msg:\n$p\n$msg2" . N(" (y/N) "), $force && $yesexpr, boolean => 1) =~ /[$yesexpr]/ or exit 1; - } - } - } - - #- install source package only (whatever the user is root or not, but use rpm for that). - if ($install_src) { - if (my @l = grep { /\.src\.rpm$/ } values %transaction_sources_install, values %transaction_sources) { - my $rpm_opt = $options{verbose} >= 0 ? 'vh' : ''; - system("rpm", "-i$rpm_opt", @l, ($urpm->{root} ? ("--root", $urpm->{root}) : @{[]})); - #- Warning : the following message is parsed in urpm::parallel_* - if ($?) { - print N("Installation failed"), "\n"; - ++$nok; - } - } - next; - } - - next if $no_install; - - #- clean to remove any src package now. - foreach (\%transaction_sources_install, \%transaction_sources) { - foreach my $id (keys %$_) { - my $pkg = $urpm->{depslist}[$id] or next; - $pkg->arch eq 'src' and delete $_->{$id}; - } - } - - if (keys(%transaction_sources_install) || keys(%transaction_sources)) { - if ($parallel) { - print N("distributing %s", join(' ', values %transaction_sources_install, values %transaction_sources)), "\n"; - #- no remove are handle here, automatically done by each distant node. - $urpm->{log}("starting distributed install"); - $urpm->{parallel_handler}->parallel_install( - $urpm, - [ keys %{$state->{rejected} || {}} ], \%transaction_sources_install, \%transaction_sources, - test => $test, - excludepath => $urpm->{options}{excludepath}, excludedocs => $urpm->{options}{excludedocs}, - ); - } else { - if ($options{verbose} >= 0) { - my @packnames = (values %transaction_sources_install, values %transaction_sources); - (my $common_prefix) = $packnames[0] =~ m!^(.*)/!; - if (length($common_prefix) && @packnames == grep { m!^\Q$common_prefix/! } @packnames) { - #- there's a common prefix, simplify message - print N("installing %s from %s", join(' ', map { s!.*/!!; $_ } @packnames), $common_prefix), "\n"; - } else { - print N("installing %s", join "\n", @packnames), "\n"; - } - } - my $to_remove = $urpm->{options}{'allow-force'} ? [] : $set->{remove} || []; - bug_log(scalar localtime(), " ", join(' ', values %transaction_sources_install, values %transaction_sources), "\n"); - $urpm->{log}("starting installing packages"); - my %install_options_common = ( - test => $test, - excludepath => $urpm->{options}{excludepath}, - excludedocs => $urpm->{options}{excludedocs}, - repackage => $urpm->{options}{repackage}, - post_clean_cache => $urpm->{options}{'post-clean'}, - oldpackage => $state->{oldpackage}, - nosize => $urpm->{options}{ignoresize}, - ignorearch => $urpm->{options}{ignorearch}, - noscripts => $urpm->{options}{noscripts}, - ); - my @l = urpm::install::install($urpm, - $to_remove, - \%transaction_sources_install, \%transaction_sources, - %install_options_common, - ); - if (@l) { - #- Warning : the following message is parsed in urpm::parallel_* - print N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l), "\n"; - if ($urpm->{options}{auto} || !$urpm->{options}{'allow-nodeps'} && !$urpm->{options}{'allow-force'}) { - ++$nok; - ++$urpm->{logger_id}; - push @errors, @l; - } else { - my $yesexpr = N("Yy"); - message_input(N("Try installation without checking dependencies? (y/N) "), - $force && $yesexpr, boolean => 1) =~ /[$yesexpr]/ or ++$nok, next; - $urpm->{log}("starting installing packages without deps"); - @l = urpm::install::install($urpm, - $to_remove, - \%transaction_sources_install, \%transaction_sources, - nodeps => 1, - %install_options_common, - ); - if (@l) { - #- Warning : the following message is parsed in urpm::parallel_* - print N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l), "\n"; - if (!$urpm->{options}{'allow-force'}) { - ++$nok; - ++$urpm->{logger_id}; - push @errors, @l; - } else { - message_input(N("Try harder to install (--force)? (y/N) "), - $force && $yesexpr, boolean => 1) =~ /[$yesexpr]/ or ++$nok, next; - $urpm->{log}("starting force installing packages without deps"); - @l = urpm::install::install($urpm, - $to_remove, - \%transaction_sources_install, \%transaction_sources, - nodeps => 1, force => 1, - %install_options_common, - ); - if (@l) { - #- Warning : the following message is parsed in urpm::parallel_* - print N("Installation failed:") . "\n" . join("\n", map { "\t$_" } @l), "\n"; - ++$nok; - ++$urpm->{logger_id}; - push @errors, @l; - } else { - ++$ok; - } - } - } else { - ++$ok; - } - } - } else { - ++$ok; - } - } - } -} - -#- keep a track of error code. -my $exit_code = 0; -if (values %error_sources) { - #- Warning : the following message is parsed in urpm::parallel_* - print N("Installation failed, some files are missing:\n%s\nYou may want to update your urpmi database", - join "\n", map { s|([^:]*://[^/:\@]*:)[^/:\@]*(\@.*)|$1xxxx$2|; " $_" } values %error_sources), "\n"; - $exit_code = 10; -} -if ($nok) { - $nok > 1 and print P("%d installation transaction failed", - "%d installation transactions failed", $nok, $nok) . (@errors && ":\n" . join("\n", map { "\t$_" } @errors)), "\n"; - if ($exit_code) { - $exit_code = $ok ? 13 : 14; - } else { - $exit_code = $ok ? 11 : 12; - } -} else { - if ($test) { - #- Warning : the following message is parsed in urpm::parallel_* - print N("Installation is possible"), "\n"; - } elsif (@names || @src_names || @files || @src_files || $auto_select) { - if (@{$state->{transaction} || []} == 0 && @ask_unselect == 0) { - if ($options{verbose} >= 0) { - if ($auto_select) { - print N("Packages are up to date"), "\n"; - } else { - my @pkgs = map { $urpm->{depslist}[$_] } map { split /\|/ } keys %requested; - my ($installed, $error) = partition { $_->flag_installed } @pkgs; - my @installed = map { scalar $_->fullname } @$installed; - my @error = map { scalar $_->fullname } @$error; - my @msg1 = @installed == 0 ? () : - @installed == 1 ? - N("Package %s is already installed", join(', ', @installed)) : - N("Packages %s are already installed", join(', ', @installed)); - my @msg2 = @error == 0 ? () : - @error == 1 ? - N("Package %s can not be installed", join(', ', @error)) : - N("Packages %s can not be installed", join(', ', @error)); - print join("\n", @msg1, @msg2, ''); - } + message_input("$msg$msg2" . N(" (y/N) "), $force && $yesexpr, boolean => 1) =~ /[$yesexpr]/ or exit 1; } - $exit_code = 15 if our $expect_install; - } - } -} + }, + ask_yes_or_no => sub { + my ($_title, $msg) = @_; # graphical title + my $yesexpr = N("Yy"); + message_input($msg, $force && $yesexpr, boolean => 1) =~ /[$yesexpr]/; + }, +}); unless ($env || $options{nolock}) { $urpmi_lock->unlock; |