summaryrefslogtreecommitdiffstats
path: root/perl-install/install/pkgs.pm
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/install/pkgs.pm')
-rw-r--r--perl-install/install/pkgs.pm77
1 files changed, 45 insertions, 32 deletions
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 3456cfb20..a9692e225 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -1,4 +1,4 @@
-package install::pkgs; # $Id: pkgs.pm 267288 2010-04-02 14:49:40Z pterjan $
+package install::pkgs;
use strict;
use feature 'state';
@@ -38,10 +38,11 @@ our %compssListDesc = (
#- TODO BEFORE TODO
#- size and correction size functions for packages.
-my $B = 1.20873;
-my $C = 4.98663; #- does not take hdlist's into account as getAvailableSpace will do it.
-sub correctSize { $B * $_[0] + $C }
-sub invCorrectSize { ($_[0] - $C) / $B }
+my $B = 120873;
+my $C = 498663; #- does not take hdlist's into account as getAvailableSpace will do it.
+my $D = 100000;
+sub correctSize { ($B * $_[0] + $C) / $D }
+sub invCorrectSize { ($_[0] * $D - $C) / $B }
sub selectedSize {
my ($packages) = @_;
@@ -69,14 +70,14 @@ sub selectedSize {
sub size2time {
my ($x, $max) = @_;
- my $A = 7e-07;
+ my $A = 7e9;
my $limit = min($max * 3 / 4, 9e8);
if ($x < $limit) {
$A * $x;
} else {
$x -= $limit;
- my $B = 6e-16;
- my $C = 15e-07;
+ my $B = 6;
+ my $C = 15e9;
$B * $x ** 2 + $C * $x + $A * $limit;
}
}
@@ -124,12 +125,14 @@ sub packagesProviding {
grep { $_->is_arch_compat } URPM::packages_providing($packages, $name);
}
-#- search package with given name and compatible with current architecture.
+#- search package with given name (and optional ISA) and compatible with current architecture.
#- take the best one found (most up-to-date).
+# FIXME: reuse urpmi higher level code instead!
sub packageByName {
my ($packages, $name) = @_;
- my @l = grep { $_->name eq $name } packagesProviding($packages, $name);
+ my $basename = $name =~ s/\(x86-..\)$//r;
+ my @l = sort { $b->id <=> $a->id } grep { $_->name eq $basename } packagesProviding($packages, $name);
my $best;
foreach (@l) {
@@ -150,16 +153,13 @@ sub packageByName {
sub _is_kernelServer_needed() {
# forbid selecting kernel-server if not having PAE since PAE support is mandatory for kernel-server:
return if !detect_devices::has_cpu_flag('pae');
- arch() =~ /i.86/ && detect_devices::dmi_detect_memory() > 3.8 * 1024 || detect_devices::isServer();
+ arch() =~ /i.86/ && detect_devices::isServer();
}
sub _bestKernel_extensions {
my ($o_match_all_hardware) = @_;
$::o->{kernel_extension} ? $::o->{kernel_extension} :
- $o_match_all_hardware ? (arch() =~ /i.86/ ? '-desktop586' : '-desktop') :
- detect_devices::is_xbox() ? '-xbox' :
- detect_devices::is_i586() ? '-desktop586' :
_is_kernelServer_needed() ? '-server' :
'-desktop';
}
@@ -172,7 +172,6 @@ sub bestKernelPackage {
if (!@kernels) {
#- fallback on most generic kernel if the suitable one is not available
- #- (only kernel-desktop586-latest is available on Dual ISO for i586)
my @fallback_exts = _bestKernel_extensions('force');
@kernels = grep { $_ } map { packageByName($packages, "kernel$_-latest") } @fallback_exts;
}
@@ -190,7 +189,8 @@ sub packagesToInstall {
log::l("examining packagesToInstall of medium $_->{name}");
push @packages, grep { $_->flag_selected } install::media::packagesOfMedium($packages, $_);
}
- log::l("found " . scalar(@packages) . " packages to install: " . formatList(5, map { $_->fullname } @packages));
+ log::l("found " . scalar(@packages) . " packages to install: " . formatList(5, map { scalar $_->fullname } @packages));
+
@packages;
}
@@ -288,17 +288,17 @@ sub select_by_package_names_or_die {
}
}
-my @suggested_package_ids;
+my @recommended_package_ids;
sub _resolve_requested_and_check {
my ($packages, $state, $requested) = @_;
my @l = $packages->resolve_requested($packages->{rpmdb}, $state, $requested,
- callback_choices => \&packageCallbackChoices, no_suggests => $::o->{no_suggests});
+ callback_choices => \&packageCallbackChoices, no_recommends => $::o->{no_recommends});
- #- keep track of suggested packages so that theys could be unselected if the "no suggests" option is choosen later:
+ #- keep track of recommended packages so that theys could be unselected if the "no recommends" option is choosen later:
if (!is_empty_hash_ref($state->{selected})) {
- my @new_ids = map { $packages->{depslist}[$_]->id } grep { $state->{selected}{$_}{suggested} } keys $state->{selected};
- @suggested_package_ids = uniq(@suggested_package_ids, @new_ids);
+ my @new_ids = map { $packages->{depslist}[$_]->id } grep { $state->{selected}{$_}{recommended} } keys %{$state->{selected}};
+ @recommended_package_ids = uniq(@recommended_package_ids, @new_ids);
}
my $error;
@@ -352,9 +352,9 @@ sub unselectAllPackages {
log::l("unselecting all packages...");
foreach (@{$packages->{depslist}}) {
my $to_select = $_->flag_base || $_->flag_installed && $_->flag_selected;
- # unselect suggested packages if minimal install:
- if ($::o->{no_suggests} && member($_->id, @suggested_package_ids)) {
- log::l("unselecting suggested package " . $_->name);
+ # unselect recommended packages if minimal install:
+ if ($::o->{no_recommends} && member($_->id, @recommended_package_ids)) {
+ log::l("unselecting recommended package " . $_->name);
undef $to_select;
}
if ($to_select) {
@@ -413,15 +413,17 @@ sub empty_packages {
$packages->{prefer_vendor_list} = '/etc/urpmi/prefer.vendor.list';
$packages->{keep_unrequested_dependencies} =
defined($o_keep_unrequested_dependencies) ? $o_keep_unrequested_dependencies : 1;
- $urpm::args::options{force_transactions} = 1;
$urpm::args::options{justdb} = $::o->{justdb};
urpm::set_tune_rpm($packages, $::o->{'tune-rpm'}) if $::o->{'tune-rpm'};
$::force = 1;
$packages->{options}{ignoresize} = 1;
+ $packages->{options}{retry} = 3;
+ $packages->{options}{downloader} = $::o->{options}{downloader};
# prevent priority upgrade (redundant for now as $urpm->{root} implies disabling it:
$packages->{options}{'priority-upgrade'} = undef;
# log $trans->add() faillure; FIXME: should we override *urpm::msg::sys_log?
$packages->{debug} = $packages->{debug_URPM} = \&log::l;
+ $urpm::args::options{deploops} = $::o->{deploops};
$packages->{options}{'curl-options'} = $::o->{curl_options} if $::o->{curl_options};
$packages;
@@ -596,7 +598,7 @@ sub computeGroupSize {
$newSelection{$id} = undef;
my $pkg = $packages->{depslist}[$id];
- my @deps = map { [ $_, keys %{$packages->{provides}{$_} || {}} ] } $pkg->requires_nosense, $pkg->suggests;
+ my @deps = map { [ $_, keys %{$packages->{provides}{$_} || {}} ] } $pkg->requires_nosense, $pkg->recommends_nosense;
foreach (sort { @$a <=> @$b } @deps) { #- sort on number of provides (it helps choosing "b" in: "a" requires both "b" and virtual={"b","c"})
my ($virtual, @choices) = @$_;
if (@choices <= 1) {
@@ -725,6 +727,7 @@ sub selectPackagesAlreadyInstalled {
my %sizes;
$packages->{rpmdb}->traverse(sub {
my ($p) = @_;
+ $sizes{$p->name} ||= 0;
$sizes{$p->name} += $p->size;
});
$packages->{sizes} = \%sizes;
@@ -782,11 +785,11 @@ sub install {
#- first stage to extract some important information
#- about the selected packages.
- my ($total, $nb);
+ my ($total, $nb) = (0, 0);
foreach my $pkg (@$toInstall) {
$packages{$pkg->id} = $pkg;
$nb++;
- $total += to_int($pkg->size); #- do not correct for upgrade!
+ $total += $pkg->size; #- do not correct for upgrade!
}
log::l("install::pkgs::install $::prefix");
@@ -795,7 +798,7 @@ sub install {
URPM::read_config_files();
# force loading libnss*
getgrent();
- URPM::add_macro(join(' ', '__dbi_cdb', URPM::expand('%__dbi_cdb'), 'nofsync'));
+ URPM::add_macro(join(' ', '__dbi_other', URPM::expand('%__dbi_other'), 'nofsync'));
my $LOG = _openInstallLog();
$packages->{log} = $packages->{info} = $packages->{print} = sub {
@@ -862,11 +865,17 @@ sub _install_raw {
log::l("rpm transactions start");
+ my ($is_installing, $verify_just_closed);
my $exit_code = urpm::main_loop::run($packages, $packages->{state}, undef, undef, {
- open_helper => $callback,
+ open_helper => sub {
+ &$callback;
+ $is_installing = 0;
+ },
+ verify => $callback,
close_helper => sub {
my ($db, $packages, $_type, $id) = @_;
&$callback;
+ return if !$is_installing; # don't check if it's installed if it's being verified
my $pkg = defined $id && $packages->{depslist}[$id] or return;
print $LOG $pkg->fullname . "\n";
my $check_installed = is_package_installed($db, $pkg);
@@ -879,7 +888,11 @@ sub _install_raw {
} else {
log::l($pkg->name . " not installed, " . URPM::rpmErrorString());
}
- }, inst => $callback,
+ },
+ inst => sub {
+ &$callback;
+ $is_installing = 1;
+ },
trans => $callback,
# FIXME: implement already_installed_or_not_installable
bad_signature => sub {
@@ -1060,7 +1073,7 @@ sub _remove_raw {
log::l("removing: " . join(' ', @$to_remove));
URPM::read_config_files();
- URPM::add_macro(URPM::expand('__dbi_cdb %__dbi_cdb nofsync'));
+ URPM::add_macro(URPM::expand('__dbi_other %__dbi_other nofsync'));
my $db = open_rpm_db_rw() or die "error opening RPM database: ", URPM::rpmErrorString();
my $trans = $db->create_transaction;
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 20:15:51 +0000