summaryrefslogtreecommitdiffstats
path: root/perl-install/pkgs.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-28 19:14:45 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-28 19:14:45 +0000
commit2ee22881483e84ea8b5ef0a5125631c04d174617 (patch)
tree049f83e2f8ef8c2ed3630d26b8a9f9c525202709 /perl-install/pkgs.pm
parent68db145d16c5fa22c876b294411cb9417ad3b08e (diff)
downloaddrakx-2ee22881483e84ea8b5ef0a5125631c04d174617.tar
drakx-2ee22881483e84ea8b5ef0a5125631c04d174617.tar.gz
drakx-2ee22881483e84ea8b5ef0a5125631c04d174617.tar.bz2
drakx-2ee22881483e84ea8b5ef0a5125631c04d174617.tar.xz
drakx-2ee22881483e84ea8b5ef0a5125631c04d174617.zip
no_comment
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r--perl-install/pkgs.pm29
1 files changed, 13 insertions, 16 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 3800e3979..b85be3b35 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -18,7 +18,8 @@ XFree86-P9000 XFree86-S3 XFree86-S3V XFree86-SVGA XFree86-W32 XFree86-I128
XFree86-Sun XFree86-SunMono XFree86-Sun24 XFree86-3DLabs kernel-BOOT
MySQL MySQL_GPL mod_php3 midgard postfix metroess metrotmpl
hackkernel hackkernel-BOOT hackkernel-fb hackkernel-headers
-hackkernel-pcmcia-cs hackkernel-smp hackkernel-smp-fb autoirpm autoirpm-icons
+hackkernel-pcmcia-cs hackkernel-smp hackkernel-smp-fb
+autoirpm autoirpm-icons numlock
);
my @preferred = qw(
@@ -124,8 +125,8 @@ sub unselect_all($) {
$_->{selected} = $_->{base} foreach values %$packages;
}
-sub psUsingDirectory() {
- my $dirname = "/tmp/rhimage/Mandrake/RPMS";
+sub psUsingDirectory(;$) {
+ my $dirname = $_[0] || "/tmp/rhimage/Mandrake/RPMS";
my %packages;
log::l("scanning $dirname for packages");
@@ -216,15 +217,6 @@ sub readCompss($) {
sub readCompssList($$$) {
my ($packages, $compss_, $lang) = @_;
- my ($r, $s) = ('', '');
- if ($lang) {
- local $SIG{__DIE__} = 'none';
- my ($l) = split ' ', lang::lang2text($lang);
- $r = "($lang";
- $r .= "|$1" if $lang =~ /(..)./;
- $r .= "|$l" if $l;
- $r .= ")";
- }
my $f = install_any::getFile("compssList") or die "can't find compssList";
local $_ = <$f>;
my $level = [ split ];
@@ -233,17 +225,22 @@ sub readCompssList($$$) {
foreach (<$f>) {
/^\s*$/ || /^#/ and next;
- /^packages\s*$/ and do { $e = $packages; $s = '-'; next };
- /^categories\s*$/ and do { $e = $compss_; $s = ':'; next };
+ /^packages\s*$/ and do { $e = $packages; next };
+ /^categories\s*$/ and do { $e = $compss_; next };
my ($name, @values) = split;
$e or log::l("neither packages nor categories");
my $p = $e->{$name} or log::l("unknown entry $name (in compssList)"), next;
-
- @values = map { $_ + 68 } @values if $name =~ /$s$r$/i;
$p->{values} = \@values;
}
+ my $locales = "locales-" . substr($lang, 0, 2);
+ if (my $p = $packages->{$locales}) {
+ foreach ($locales, @{$p->{provides} || []}) {
+ my $p = $packages->{$_} or next;
+ $p->{values} = [ map { $_ + 70 } @{$p->{values}} ];
+ }
+ }
$level;
}