summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-02-13 16:47:32 +0000
committerFrancois Pons <fpons@mandriva.com>2002-02-13 16:47:32 +0000
commit408bb7d8e0515fb181d06c8294a73aebafbac96b (patch)
tree9d0d1cbbc6a565dfade434357e7f46f0f64b7b96
parent8de636d48eb3b05db6aa8e2eeebd4eaabfed06de (diff)
downloaddrakx-backup-do-not-use-408bb7d8e0515fb181d06c8294a73aebafbac96b.tar
drakx-backup-do-not-use-408bb7d8e0515fb181d06c8294a73aebafbac96b.tar.gz
drakx-backup-do-not-use-408bb7d8e0515fb181d06c8294a73aebafbac96b.tar.bz2
drakx-backup-do-not-use-408bb7d8e0515fb181d06c8294a73aebafbac96b.tar.xz
drakx-backup-do-not-use-408bb7d8e0515fb181d06c8294a73aebafbac96b.zip
added extension to setSelectedFromCompssList.
-rw-r--r--perl-install/pkgs.pm14
1 files changed, 10 insertions, 4 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 5107c0bc8..d312c1c13 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -741,7 +741,7 @@ sub saveCompssUsers {
}
sub setSelectedFromCompssList {
- my ($packages, $compssUsersChoice, $min_level, $max_size) = @_;
+ my ($packages, $compssUsersChoice, $min_level, $max_size, $otherOnly) = @_;
$compssUsersChoice->{TRUE} = 1; #- ensure TRUE is set
my $nb = selectedSize($packages);
foreach my $p (sort { packageRate($b) <=> packageRate($a) } values %{$packages->{names}}) {
@@ -767,10 +767,16 @@ sub setSelectedFromCompssList {
}
#- at this point the package can safely be selected.
- selectPackage($packages, $p);
+ if ($otherOnly) {
+ selectPackage($packages, $p, 0, $otherOnly);
+ } else {
+ selectPackage($packages, $p);
+ }
+ }
+ unless ($otherOnly) {
+ log::l("setSelectedFromCompssList: reached size ", formatXiB($nb), ", up to indice $min_level (less than ", formatXiB($max_size), ")");
+ log::l("setSelectedFromCompssList: ", join(" ", sort map { packageName($_) } grep { packageFlagSelected($_) } @{$packages->{depslist}}));
}
- log::l("setSelectedFromCompssList: reached size ", formatXiB($nb), ", up to indice $min_level (less than ", formatXiB($max_size), ")");
- log::l("setSelectedFromCompssList: ", join(" ", sort map { packageName($_) } grep { packageFlagSelected($_) } @{$packages->{depslist}}));
$min_level;
}