summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-10-01 01:59:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-10-01 01:59:12 +0000
commitfedea72292604778baa7341b72e2dd458ef2239c (patch)
tree4ff702319ab143c45049f96b47b4144823ad9278
parenteb8cd34842ee4f6079b85dcb3f67f2d4c72bbd44 (diff)
downloaddrakx-fedea72292604778baa7341b72e2dd458ef2239c.tar
drakx-fedea72292604778baa7341b72e2dd458ef2239c.tar.gz
drakx-fedea72292604778baa7341b72e2dd458ef2239c.tar.bz2
drakx-fedea72292604778baa7341b72e2dd458ef2239c.tar.xz
drakx-fedea72292604778baa7341b72e2dd458ef2239c.zip
fix logging rpmsrate_flags_chosen
-rw-r--r--perl-install/install2.pm3
-rw-r--r--perl-install/pkgs.pm3
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index dcaeca6d5..08311e9a7 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -220,7 +220,8 @@ sub choosePackages {
#- always setPackages as it may have to copy hdlist files and synthesis files.
installStepsCall($o, $auto, 'setPackages', $o->{isUpgrade} && $ent_number == 1);
installStepsCall($o, $auto, 'choosePackages', $o->{packages}, $o->{compssUsers}, $ent_number == 1);
- log::l("rpmsrate_flags_chosen's: ", join(" ", sort(map_each { if_($::b, $::a) } %{$o->{rpmsrate_flags_chosen}})));
+ my @flags = map_each { if_($::b, $::a) } %{$o->{rpmsrate_flags_chosen}};
+ log::l("rpmsrate_flags_chosen's: ", join(' ', sort @flags));
#- check pre-condition where base backage has to be selected.
pkgs::packageByName($o->{packages}, 'basesystem')->flag_available or die "basesystem package not selected";
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 1a62081d8..3bfa10238 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -683,7 +683,8 @@ sub setSelectedFromCompssList {
last;
}
}
- log::l("setSelectedFromCompssList: reached size ", formatXiB($nb), ", up to indice $min_level (less than ", formatXiB($max_size), ") for flags ", sort(map_each { if_($::b, $::a) } %$rpmsrate_flags_chosen));
+ my @flags = map_each { if_($::b, $::a) } %$rpmsrate_flags_chosen;
+ log::l("setSelectedFromCompssList: reached size ", formatXiB($nb), ", up to indice $min_level (less than ", formatXiB($max_size), ") for flags ", join(' ', sort @flags));
log::l("setSelectedFromCompssList: ", join(" ", sort map { $_->name } grep { $_->flag_selected } @{$packages->{depslist}}));
$min_level;
}