gunnar: server/kolabconf/lib/Kolab Conf.pm,1.4,1.5

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabconf/lib/Kolab
In directory doto:/tmp/cvs-serv23637/kolabconf/lib/Kolab

Modified Files:
	Conf.pm 
Log Message:
Added with_horde support to kolabd. And a fix in kolabconf: kolab/issue1879 (kolabconf poor error message in buildCyrusConfig)

Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/kolabconf/lib/Kolab/Conf.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Conf.pm	2 Aug 2007 06:43:10 -0000	1.4
+++ Conf.pm	7 Aug 2007 11:40:15 -0000	1.5
@@ -75,12 +75,12 @@
    my $gid = (getgrnam($group))[2];
    Kolab::log('T', sprintf("Changing permissions of %s to 0%o", $file, $perm ), KOLAB_DEBUG );
    if( chmod($perm, $file) != 1 ) {
-     Kolab::log('T', "Unable to change permissions of `$file' to ".sprintf("0%o",$perm), KOLAB_ERROR);
+     Kolab::log('T', "Unable to change permissions of `$file' to ".sprintf("0%o",$perm) . ": $!", KOLAB_ERROR);
      exit(1);
    }
    Kolab::log('T', "Changing owner of $file to $owner:$group ($uid:$gid)", KOLAB_DEBUG );
    if( chown($uid,$gid,$file) != 1 ) {
-     Kolab::log('T', "Unable to change ownership of `$file' to $uid:$gid", KOLAB_ERROR);
+     Kolab::log('T', "Unable to change ownership of `$file' to $uid:$gid: $!", KOLAB_ERROR);
      exit(1);
    }
 }
@@ -116,7 +116,7 @@
 
     my $template;
     if (!($template = IO::File->new($tmpl, 'r'))) {
-        Kolab::log('T', "Unable to open template file `$tmpl'", KOLAB_ERROR);
+        Kolab::log('T', "Unable to open template file `$tmpl': $!", KOLAB_ERROR);
 	# Error, fail gracefully
 	return;
     }
@@ -125,7 +125,7 @@
 				    DIR => $Kolab::config{"kolabdir"},
 				    SUFFIX => '.kolabtmp',
 				    UNLINK => 0 ))) {
-        Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
+        Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
         exit(1);
     }
 
@@ -288,7 +288,7 @@
 
     my $transport;
     if (!($transport = IO::File->new($cfg, 'a'))) {
-        Kolab::log('T', "Unable to create Postfix $map map", KOLAB_ERROR);
+        Kolab::log('T', "Unable to create Postfix $map map: $!", KOLAB_ERROR);
         exit(1);
     }
 
@@ -366,12 +366,12 @@
     my $cyrusconf;
     my $cyrustemplate;
     if (!($cyrustemplate = IO::File->new($keytemplate, 'r'))) {
-      Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
+      Kolab::log('T', "Unable to open configuration file `$keytemplate': $!", KOLAB_ERROR);
       exit(1);
     }
 
     if (!($cyrusconf = IO::File->new($cfg, 'w'))) {
-        Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
+        Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
         exit(1);
     }
 
@@ -444,7 +444,7 @@
 
     my $groupconf;
     if (!($groupconf = IO::File->new($cfg, 'a'))) {
-        Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
+        Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
         exit(1);
     }
 
@@ -513,7 +513,7 @@
 
     my $access;
     if (!($access = IO::File->new($cfg, 'a'))) {
-        Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
+        Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
         exit(1);
     }
 
@@ -606,7 +606,7 @@
 
     my $repl;
     if (!($repl = IO::File->new($cfg, 'a'))) {
-        Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
+        Kolab::log('T', "Unable to open configuration file `$cfg': $!", KOLAB_ERROR);
         exit(1);
     }