summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-09-02 12:31:11 +0000
committerFrancois Pons <fpons@mandriva.com>2003-09-02 12:31:11 +0000
commit5487bcf0aaddc34d08d904994b1526968c95d091 (patch)
tree79754490409f45e909da0041e1ed9b4bd8b97560
parentc4cb094ee6b383170a528834539c6ae21c1d0fdb (diff)
downloaddrakx-5487bcf0aaddc34d08d904994b1526968c95d091.tar
drakx-5487bcf0aaddc34d08d904994b1526968c95d091.tar.gz
drakx-5487bcf0aaddc34d08d904994b1526968c95d091.tar.bz2
drakx-5487bcf0aaddc34d08d904994b1526968c95d091.tar.xz
drakx-5487bcf0aaddc34d08d904994b1526968c95d091.zip
fixed duplicate entries in src architecture.
-rw-r--r--perl-install/install_steps_gtk.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 511c0b2da..9c5b01ac6 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -284,7 +284,7 @@ sub reallyChooseGroups {
}
sub choosePackagesTree {
- my ($o, $packages, $o_limit_to_medium) = @_;
+ my ($o, $packages, $o_limit_medium) = @_;
my $available = install_any::getAvailableSpace($o);
my $availableCorrected = pkgs::invCorrectSize($available / sqr(1024)) * sqr(1024);
@@ -313,7 +313,9 @@ sub choosePackagesTree {
build_tree => sub {
my ($add_node, $flat) = @_;
if ($flat) {
- foreach (sort map { $_->name } grep { !$o_limit_to_medium || pkgs::packageMedium($packages, $_) == $o_limit_to_medium }
+ foreach (sort map { $_->name }
+ grep { !$o_limit_medium || pkgs::packageMedium($packages, $_) == $o_limit_medium }
+ grep { $_ && $_->arch ne 'src' }
@{$packages->{depslist}}) {
$add_node->($_, undef);
}
@@ -323,7 +325,7 @@ sub choosePackagesTree {
#$fl{$_} = $o->{compssUsersChoice}{$_} foreach @{$o->{compssUsers}{$root}{flags}}; #- FEATURE:improve choce of packages...
$fl{$_} = 1 foreach @{$o->{compssUsers}{$root}{flags}};
foreach my $p (@{$packages->{depslist}}) {
- !$o_limit_to_medium || pkgs::packageMedium($packages, $p) == $o_limit_to_medium or next;
+ !$o_limit_medium || pkgs::packageMedium($packages, $p) == $o_limit_medium or next;
my @flags = $p->rflags;
next if !($p->rate && any { any { !/^!/ && $fl{$_} } split('\|\|') } @flags);
$p->rate >= 3 ?
@@ -434,7 +436,7 @@ sub choosePackagesTree {
],
state => {
auto_deps => 1,
- flat => $o_limit_to_medium,
+ flat => $o_limit_medium,
},
};