summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-10-27 12:05:06 +0000
committerFrancois Pons <fpons@mandriva.com>2000-10-27 12:05:06 +0000
commit604e0ab8689536f5ad78eba1035069a9645516e4 (patch)
tree30332d27e3e25057e5ced09e30c3559f2394598f /perl-install
parentbe4f26c73d9caab8835f185ae3f7736165b315e3 (diff)
downloaddrakx-604e0ab8689536f5ad78eba1035069a9645516e4.tar
drakx-604e0ab8689536f5ad78eba1035069a9645516e4.tar.gz
drakx-604e0ab8689536f5ad78eba1035069a9645516e4.tar.bz2
drakx-604e0ab8689536f5ad78eba1035069a9645516e4.tar.xz
drakx-604e0ab8689536f5ad78eba1035069a9645516e4.zip
Make sure $meta_class is defined in readCompsUsers (for HTTP hack)
before reading a compssUsers file.
Diffstat (limited to 'perl-install')
-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 ea9b0f154..592f0143a 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -676,7 +676,7 @@ sub readCompssUsers {
$_ = $packages->[0]{$_} or log::l("unknown package $_ (in compssUsers)") foreach @$l;
};
my $file = 'Mandrake/base/compssUsers';
- my $f = install_any::getFile("$file.$meta_class") || install_any::getFile($file) or die "can't find $file";
+ my $f = $meta_class && install_any::getFile("$file.$meta_class") || install_any::getFile($file) or die "can't find $file";
foreach (<$f>) {
/^\s*$/ || /^#/ and next;
s/#.*//;
/span> _("Cancel")); print map { "$_\n" } @$messages; my $i; if (@$list < 10 && sum(map { length $_ } @$list) < 50) { my @l; do { if (defined $i) { @l ? print _("Ambiguity (%s), be more precise\n", join(", ", @l)) : print _("Bad choice, try again\n"); } @$list == 1 ? print @$list : print join("/", @$list), _(" ? (default %s) ", $def); $i = readln() || $def; @l = grep { /^$i/ } @$list; } until (@l == 1); $l[0]; } else { my $n = 0; foreach (@$list) { $n++; $def eq $_ and $def = $n; print "$n: $_\n"; } do { defined $i and print _("Bad choice, try again\n"); print _("Your choice? (default %s) ", $def); $i = readln() || $def; } until (check_it($i, $n)); $list->[$i - 1]; } } sub ask_many_from_list_refW { my ($o, $title, $messages, $list, $val) = @_; my @defaults; print map { "$_\n" } @$messages; my $n = 0; foreach (@$list) { $n++; print "$n: $_\n"; push @defaults, $n if ${$val->[$n - 1]}; } my $i; TRY_AGAIN: defined $i and print _("Bad choice, try again\n"); print _("Your choice? (default %s enter `none' for none) ", join(',', @defaults)); $i = readln(); my @t = split ',', $i; if ($i =~ /^none$/i) { @t = (); } else { foreach (@t) { check_it($_, $n) or goto TRY_AGAIN } } $$_ = 0 foreach @$val; ${$val->[$_ - 1]} = 1 foreach @t; $val; } sub wait_messageW { my ($o, $title, $message) = @_; print join "\n", @$message; } sub wait_message_nextW { my $m = join "\n", @{$_[1]}; print "\r$m", ' ' x (60 - length $m); } sub wait_message_endW { print "\nDone\n" } 1;