This commit was manufactured by cvs2svn to create branch

'unlabeled-1.1.1'.

1 files changed, 14 insertions, 38 deletions

diff --git a/perl-install/log.pm b/perl-install/log.pm
index 853cabc8c..0fe696f07 100644
--- a/perl-install/log.pm
+++ b/perl-install/log.pm
@@ -1,58 +1,34 @@
-package log;
-
 use diagnostics;
 use strict;
-use c;
 
+package log;
 
-#-#####################################################################################
-#- Globals
-#-#####################################################################################
 my $logOpen = 0;
 my $logDebugMessages = 0;
 
+1;
 
-#-######################################################################################
-#- Functions
-#-######################################################################################
-sub F() { *LOG }
+sub fd() { fileno LOG }
 
-sub l {
+sub l { 
     $logOpen or openLog();
-    if ($::isStandalone) {
-	c::syslog(join "", @_);
-    } else {
-	print LOG "* ", @_, "\n";
-	print LOG2 "* ", @_, "\n";
-    }
+    print LOG "* ", @_, "\n"; 
+    print LOG2 "* ", @_, "\n"; 
 }
 sub ld { $logDebugMessages and &l }
 sub w { &l }
 
 sub openLog(;$) {
-    if ($::isStandalone) {
-	c::openlog("DrakX");
+    if ($_[0]) { # useLocal
+	open LOG, "> $_[0]" or die "no log possible :(";
     } else {
-	if ($_[0]) { #- useLocal
-	    open LOG, "> $_[0]";# or die "no log possible :(";
-	} else {
-	    open LOG, "> /dev/tty3" or open LOG, ">> /tmp/install.log";# or die "no log possible :(";
-	}
-	open LOG2, ">> /tmp/ddebug.log";# or die "no log possible :(";
-	select((select(LOG),  $| = 1)[0]);
-	select((select(LOG2), $| = 1)[0]);
-    }
+	open LOG, "> /dev/tty3" or open LOG, ">> /tmp/install.log" or die "no log possible :(";
+    } 
+    open LOG2, ">> /tmp/ddebug.log" or die "no log possible :(";
+    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; }
-}
-
-#-######################################################################################
-#- Wonderful perl :(
-#-######################################################################################
-1;
+sub closeLog() { close LOG; close LOG2; }