summaryrefslogtreecommitdiffstats
path: root/perl-install/pkgs.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-08 11:55:46 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-08 11:55:46 +0000
commit5d7cb6233c72ed5fb29a250b06716e9ee69b16e8 (patch)
treea45130893d8d64bb761a306de27223977ab69828 /perl-install/pkgs.pm
parent4de99d77e63a027ad51903d7d2760c1f027bff9a (diff)
downloaddrakx-backup-do-not-use-5d7cb6233c72ed5fb29a250b06716e9ee69b16e8.tar
drakx-backup-do-not-use-5d7cb6233c72ed5fb29a250b06716e9ee69b16e8.tar.gz
drakx-backup-do-not-use-5d7cb6233c72ed5fb29a250b06716e9ee69b16e8.tar.bz2
drakx-backup-do-not-use-5d7cb6233c72ed5fb29a250b06716e9ee69b16e8.tar.xz
drakx-backup-do-not-use-5d7cb6233c72ed5fb29a250b06716e9ee69b16e8.zip
(naughtyServers): add drakxtools-http
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r--perl-install/pkgs.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 1422fd078..8bb0763a3 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -1560,7 +1560,7 @@ sub naughtyServers {
my @naughtyServers = qw(FreeWnn MySQL am-utils boa cfengine cups
finger-server freeswan imap jabber leafnode lpr mon ntp apache
openssh-server pidentd postfix postgresql-server proftpd rwall rwho
-telnet-server webmin wu-ftpd ypbind); # portmap nfs-utils-clients
+telnet-server webmin wu-ftpd ypbind drakxtools-http); # portmap nfs-utils-clients
grep {
my $p = packageByName($packages, $_);
{ !/LOCALES/ } @l;
}
sub or_clean {
- my (@l) = map { [ sort split('&&') ] } @_;
+ my (@l) = map { [ sort split('&&') ] } @_ or return '';
my @r;
B: while (@l) {
my $e = shift @l;
@@ -768,7 +770,7 @@ sub computeGroupSize {
next if !$rate || $rate < $min_level;
my $flags = join("\t", @flags = or_ify(@flags));
- $group{packageName($p)} = $flags =~ /SYSTEM/ ? 'SYSTEM' : ($memo{$flags} ||= or_clean(@flags));
+ $group{packageName($p)} = ($memo{$flags} ||= or_clean(@flags));
#- determine the packages that will be selected when selecting $p. the packages are not selected.
my %newSelection;
@@ -778,8 +780,9 @@ sub computeGroupSize {
$packages->{names}{$_}[$VALUES] =~ /\t(.*)/;
join("\t", or_ify(split("\t", $1)));
};
+ next if length($s) > 80; # HACK, truncated too complicated expressions, too costly
my $m = "$flags\t$s";
- $group{$_} = $m =~ /SYSTEM/ ? 'SYSTEM' : ($memo{$m} ||= or_clean(@flags, split("\t", $s)));
+ $group{$_} = ($memo{$m} ||= or_clean(@flags, split("\t", $s)));
}
}
my (%sizes, %pkgs);
@@ -788,7 +791,7 @@ sub computeGroupSize {
$sizes{$v} += packageSize($packages->{names}{$k});
}
log::l(sprintf "%s %dMB %s", $_, $sizes{$_} / sqr(1024), join(',', @{$pkgs{$_}})) foreach keys %sizes;
- \%sizes;
+ \%sizes, \%pkgs;
}