summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-08-29 16:19:26 +0000
committerFrancois Pons <fpons@mandriva.com>2003-08-29 16:19:26 +0000
commit091a79a9777e714be660d8b96907c4b441ccc561 (patch)
treebe5d3465e4c3c5e2e5ef17e6c60716ad5a753525
parent2bcdc44d28b189a4254d4b451d7406247a0fc203 (diff)
downloaddrakx-091a79a9777e714be660d8b96907c4b441ccc561.tar
drakx-091a79a9777e714be660d8b96907c4b441ccc561.tar.gz
drakx-091a79a9777e714be660d8b96907c4b441ccc561.tar.bz2
drakx-091a79a9777e714be660d8b96907c4b441ccc561.tar.xz
drakx-091a79a9777e714be660d8b96907c4b441ccc561.zip
try to make sure additional CD are taken into account if low memory available
for configuring urpmi.
-rw-r--r--perl-install/pkgs.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 7ccb63627..5c168f345 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -423,7 +423,7 @@ sub psUsingHdlist {
#- avoid using more than one medium if Cd is not ejectable.
#- but keep all medium here so that urpmi has the whole set.
- $method eq 'cdrom' && $medium > 1 && !common::usingRamdisk() and return;
+ $m->{ignored} ||= $method eq 'cdrom' && $medium > 1 && !common::usingRamdisk();
#- parse synthesis (if available) of directly hdlist (with packing).
if ($m->{ignored}) {
@@ -720,7 +720,7 @@ sub computeGroupSize {
my $s = $group{$p->name} || do {
join("\t", or_ify($p->rflags));
};
- next if length($s) > 80; # HACK, truncated too complicated expressions, too costly
+ next if length($s) > 120; # HACK, truncated too complicated expressions, too costly
my $m = "$flags\t$s";
$group{$p->name} = ($memo{$m} ||= or_clean(@flags, split("\t", $s)));
}