package log; # $Id$ use diagnostics; use strict; use c; my ($LOG, $LOG2); #-##################################################################################### #- Globals #-##################################################################################### my $logOpen = 0; my $logDebugMessages = 0; #-###################################################################################### #- Functions #-###################################################################################### sub F() { $LOG } sub l { $logOpen or openLog(); if ($::testing) { print STDERR @_, "\n"; } elsif ($::isStandalone) { c::syslog(c::LOG_WARNING(), join("", @_)); } elsif ($::isInstall) { print $LOG "* ", @_, "\n"; print $LOG2 "* ", @_, "\n"; } else { print STDERR @_, "\n"; } } sub ld { $logDebugMessages and &l } sub w { &l } sub openLog(;$) { if ($::isInstall) { if ($_[0]) { #- useLocal open $LOG, "> $_[0]"; #-# } else { open $LOG, "> /dev/tty3"; #-# } open $LOG2, ">> /tmp/ddebug.log"; #-# select((select($LOG), $| = 1)[0]); select((select($LOG2), $| = 1)[0]); } exists $ENV{DEBUG} and $logDebugMessages = 1; $logOpen = 1; } sub closeLog() { if ($::isStandalone) { c::closelog(); } else { close $LOG; close $LOG2 } } sub explanations { c::syslog(c::LOG_INFO()|c::LOG_LOCAL1(), "@_") } 1; 5-2.6.33 Mageia Installer and base platform for many utilitiesThierry Vignaud [tv]
summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-05-13 14:48:59 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-05-13 14:48:59 +0000
commita976235791b70bfe49785571a0c59ca18a50a565 (patch)
tree4ef869dfdc955de73a8d77dfe2ff7f2bf7de3e5a /perl-install/Xconfig
parent6f03a84148ac2d0aa1e64b7d64c3071d89317492 (diff)
downloaddrakx-a976235791b70bfe49785571a0c59ca18a50a565.tar
drakx-a976235791b70bfe49785571a0c59ca18a50a565.tar.gz
drakx-a976235791b70bfe49785571a0c59ca18a50a565.tar.bz2
drakx-a976235791b70bfe49785571a0c59ca18a50a565.tar.xz
drakx-a976235791b70bfe49785571a0c59ca18a50a565.zip
(configure_everything_or_configure_chooser) keyboard and mouse
paremeters really are optional, Xconfig::default::configure() handle the fact they're undefined for us
Diffstat (limited to 'perl-install/Xconfig')
-rw-r--r--perl-install/Xconfig/main.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index 38b0c0e64..ee1065f49 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -141,9 +141,9 @@ sub configure_chooser {
}
sub configure_everything_or_configure_chooser {
- my ($in, $options, $auto, $keyboard, $mouse) = @_;
+ my ($in, $options, $auto, $o_keyboard, $o_mouse) = @_;
my $raw_X = Xconfig::xfree->read;
- my $default = Xconfig::default::configure($keyboard, $mouse);
+ my $default = Xconfig::default::configure($o_keyboard, $o_mouse);
my $has_conf = @{$raw_X->{xfree3}} || @{$raw_X->{xfree4}};
$raw_X->{xfree3} = $default->{xfree3} if !@{$raw_X->{xfree3}};
$raw_X->{xfree4} = $default->{xfree4} if !@{$raw_X->{xfree4}};
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-27 23:16:39 +0000