diff options
Diffstat (limited to 'perl-install/do_pkgs.pm')
| -rw-r--r-- | perl-install/do_pkgs.pm | 174 |
1 files changed, 117 insertions, 57 deletions
diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm index f8ed44028..cfc244711 100644 --- a/perl-install/do_pkgs.pm +++ b/perl-install/do_pkgs.pm @@ -1,4 +1,4 @@ -package do_pkgs; # $Id$ +package do_pkgs; # $Id: do_pkgs.pm 263860 2009-11-30 15:20:14Z blino $ sub do_pkgs { my ($in) = @_; @@ -12,13 +12,39 @@ use common; sub ensure_is_installed { my ($do, $pkg, $o_file, $b_auto) = @_; - if (! $o_file || ! -e "$::prefix$o_file") { - $do->in->ask_okcancel('', N("The package %s needs to be installed. Do you want to install it?", $pkg), 1) - or return if !$b_auto; - $do->install($pkg) or return; + if ($o_file ? -e "$::prefix$o_file" : $do->is_installed($pkg)) { + return 1; } + + $do->in->ask_okcancel(N("Warning"), N("The package %s needs to be installed. Do you want to install it?", $pkg), 1) + or return if !$b_auto && $do->in; + + if (!$do->install($pkg)) { + $do->in->ask_warn(N("Error"), N("Could not install the %s package!", $pkg)) if $do->in; + return; + } + if ($o_file && ! -e "$::prefix$o_file") { - $do->in->ask_warn('', N("Mandatory package %s is missing", $pkg)); + $do->in->ask_warn(N("Error"), N("Mandatory package %s is missing", $pkg)) if $do->in; + return; + } + 1; +} + +sub ensure_are_installed { + my ($do, $pkgs, $b_auto) = @_; + + my @not_installed = difference2($pkgs, [ $do->are_installed(@$pkgs) ]) or return 1; + + $do->in->ask_okcancel(N("Warning"), N("The following packages need to be installed:\n") . join(', ', @not_installed), 1) + or return if !$b_auto && $do->in; + + if (!$do->install(@not_installed)) { + if ($do->in) { + $do->in->ask_warn(N("Error"), N("Could not install the %s package!", $not_installed[0])); + } else { + log::l("Could not install packages: " . join(' ', @not_installed)); + } return; } 1; @@ -28,12 +54,36 @@ sub ensure_binary_is_installed { my ($do, $pkg, $binary, $b_auto) = @_; if (!whereis_binary($binary, $::prefix)) { - $do->in->ask_okcancel('', N("The package %s needs to be installed. Do you want to install it?", $pkg), 1) - or return if !$b_auto; - $do->install($pkg) or return; + $do->in->ask_okcancel(N("Warning"), N("The package %s needs to be installed. Do you want to install it?", $pkg), 1) + or return if !$b_auto && $do->in; + if (!$do->install($pkg)) { + $do->in->ask_warn(N("Error"), N("Could not install the %s package!", $pkg)) if $do->in; + return; + } } if (!whereis_binary($binary, $::prefix)) { - $do->in->ask_warn('', N("Mandatory package %s is missing", $pkg)); + $do->in->ask_warn(N("Error"), N("Mandatory package %s is missing", $pkg)) if $do->in; + return; + } + 1; +} + +# takes a list of [ "package", "file" ] and installs package if file is not there +sub ensure_files_are_installed { + my ($do, $pkgs, $b_auto) = @_; + + my @not_installed = map { my ($package, $file) = @$_; if_(!whereis_binary($file, $::prefix), $package) } @$pkgs; + return 1 if !@not_installed; + + $do->in->ask_okcancel(N("Warning"), N("The following packages need to be installed:\n") . join(', ', @not_installed), 1) + or return if !$b_auto && $do->in; + + if (!$do->install(@not_installed)) { + if ($do->in) { + $do->in->ask_warn(N("Error"), N("Could not install the %s package!", $not_installed[0])); + } else { + log::l("Could not install packages: " . join(' ', @not_installed)); + } return; } 1; @@ -58,21 +108,25 @@ sub is_installed { $do->are_installed($name); } +#- takes something like "ati-kernel" +#- returns: +#- - the various ati-kernel-2.6.XX-XXmdk available for the installed kernels +#- - dkms-ati if available sub check_kernel_module_packages { - my ($do, $base_name, $o_ext_name) = @_; + my ($do, $base_name) = @_; require bootloader; - my ($short_name) = $base_name =~ /^(.*)-kernel$/; - my @rpms = $do->are_available("dkms-$short_name", - map { - $base_name . '-' . bootloader::vmlinuz2version($_); - } bootloader::installed_vmlinuz()); - my @ext = $o_ext_name ? $do->are_available($o_ext_name) : (); + my @test_rpms = ( + 'dkms-' . $base_name, + map { $base_name . '-kernel-' . bootloader::vmlinuz2version($_) } bootloader::installed_vmlinuz() + ); + my @rpms = $do->are_available(@test_rpms); + @rpms = $do->are_installed(@test_rpms) if !@rpms; + @rpms or return; - log::l("found kernel module packages $_") foreach @rpms, @ext; + log::l("those kernel module packages can be installed: " . join(' ', @rpms)); - #- we want at least a kernel package and the ext package if specified - @rpms && (!$o_ext_name || @ext) && [ @rpms, @ext ]; + \@rpms; } ################################################################################ @@ -84,7 +138,10 @@ our @ISA = qw(do_pkgs_common); sub new { my ($type, $in) = @_; - require pkgs; + + $in->isa('interactive') or undef $in; + + require install::pkgs; bless { in => $in, o => $::o }, $type; } @@ -96,28 +153,29 @@ sub in { sub install { my ($do, @l) = @_; log::l("do_pkgs_during_install::install"); - if ($::testing || $::globetrotter) { + if ($::testing) { log::l("i would install packages " . join(' ', @l)); - return 1; + 1; } else { $do->{o}->pkg_install(@l); + 1; #- HACK, need better fix in install::steps::pkg_install() } } sub what_provides { my ($do, $name) = @_; - map { $_->name } pkgs::packagesProviding($do->{o}{packages}, $name); + map { $_->name } install::pkgs::packagesProviding($do->{o}{packages}, $name); } sub are_available { my ($do, @pkgs) = @_; - grep { pkgs::packageByName($do->{o}{packages}, $_) } @pkgs; + grep { install::pkgs::packageByName($do->{o}{packages}, $_) } @pkgs; } sub are_installed { my ($do, @l) = @_; grep { - my $p = pkgs::packageByName($do->{o}{packages}, $_); + my $p = install::pkgs::packageByName($do->{o}{packages}, $_); $p && $p->flag_available; } @l; } @@ -126,8 +184,8 @@ sub remove { my ($do, @l) = @_; @l = grep { - my $p = pkgs::packageByName($do->{o}{packages}, $_); - pkgs::unselectPackage($do->{o}{packages}, $p) if $p; + my $p = install::pkgs::packageByName($do->{o}{packages}, $_); + install::pkgs::unselectPackage($do->{o}{packages}, $p) if $p; $p; } @l; run_program::rooted($::prefix, 'rpm', '-e', @l); @@ -137,7 +195,7 @@ sub remove_nodeps { my ($do, @l) = @_; @l = grep { - my $p = pkgs::packageByName($do->{o}{packages}, $_); + my $p = install::pkgs::packageByName($do->{o}{packages}, $_); if ($p) { $p->set_flag_requested(0); $p->set_flag_required(0); @@ -152,6 +210,7 @@ package do_pkgs_standalone; use run_program; use common; use log; +use feature qw(state); our @ISA = qw(do_pkgs_common); @@ -162,10 +221,6 @@ sub new { sub in { my ($do) = @_; - $do->{in} ||= do { - require interactive; - interactive->vnew; - }; $do->{in}; } @@ -179,12 +234,17 @@ sub install { return 1; } - my $_wait = $do->in->wait_message('', N("Installing packages...")); - $do->in->suspend; - log::explanations("installed packages @l"); - #- --expect-install added in urpmi 4.6.11 - my $ret = system('urpmi', '--allow-medium-change', '--auto', '--no-verify-rpm', '--gui', '--expect-install', @l) == 0; - $do->in->resume; + my @options = ('--allow-medium-change', '--auto', '--no-verify-rpm', '--expect-install', @l); + my $ret; + if (check_for_xserver() && -x '/usr/bin/gurpmi') { + $ret = system('gurpmi', @options) == 0; + } else { + my $_wait = $do->in && $do->in->wait_message(N("Please wait"), N("Installing packages...")); + $do->in->suspend if $do->in; + log::explanations("installing packages @l"); + $ret = system('urpmi', @options) == 0; + $do->in->resume if $do->in; + } $ret; } @@ -192,17 +252,19 @@ sub are_available { my ($_do, @pkgs) = @_; my %pkgs = map { $_ => 1 } @pkgs; + require urpm::media; + state $urpm; eval { - local *_; - require urpm; - my $urpm = urpm->new; - $urpm->read_config(nocheck_access => 1); - foreach (grep { !$_->{ignore} } @{$urpm->{media} || []}) { - $urpm->parse_synthesis("$urpm->{statedir}/synthesis.$_->{hdlist}"); + if (!$urpm) { + $urpm = urpm->new; + $urpm->{log} = \&log::l; + urpm::media::configure($urpm, + nocheck_access => 1, + no_skiplist => 1, + no_second_pass => 1); } map { $_->name } grep { $pkgs{$_->name} } @{$urpm->{depslist} || []}; }; - } sub what_provides { @@ -210,25 +272,23 @@ sub what_provides { split('\|', chomp_(run_program::get_stdout('urpmq', $name))); } -sub is_installed { - my ($do, $name) = @_; - are_installed($do, $name); -} - sub are_installed { my ($_do, @l) = @_; + @l or return; + my @l2; - run_program::run('/bin/rpm', '>', \@l2, '-q', '--qf', "%{name}\n", @l); #- do not care about the return value - intersection(\@l, [ chomp_(@l2) ]); #- can not return directly @l2 since it contains things like "package xxx is not installed" + my $query_all = (any { /\*/ } @l) ? 'a' : ''; + run_program::run('/bin/rpm', '>', \@l2, '-q' . $query_all, '--qf', "%{name}\n", @l); #- do not care about the return value + $query_all ? chomp_(@l2) : intersection(\@l, [ chomp_(@l2) ]); #- cannot return directly @l2 since it contains things like "package xxx is not installed" } sub remove { my ($do, @l) = @_; - my $_wait = $do->in->wait_message('', N("Removing packages...")); - $do->in->suspend; - log::explanations("removed packages @l"); + my $_wait = $do->in && $do->in->wait_message(N("Please wait"), N("Removing packages...")); + $do->in->suspend if $do->in; + log::explanations("removing packages @l"); my $ret = system('rpm', '-e', @l) == 0; - $do->in->resume; + $do->in->resume if $do->in; $ret; } |