gunnar: server/perl-kolab/lib Kolab.pm,1.24,1.25

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/perl-kolab/lib
In directory doto:/tmp/cvs-serv20490/lib

Modified Files:
	Kolab.pm 
Log Message:
Allow returning only the global information when bootstrapping. Removed prefix variable.

Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Kolab.pm	14 Aug 2008 19:17:42 -0000	1.24
+++ Kolab.pm	10 Oct 2008 14:24:00 -0000	1.25
@@ -83,6 +83,7 @@
 sub reloadConfig
 {
     my $kolab_globals = shift;
+    my $globals_only = shift || 0;
 
     my $tempval;
     my $ldap;
@@ -100,6 +101,11 @@
     # First read `kolab.globals'
     %config = readConfig(%config, $kolab_globals);
 
+    # Return if we should only read the base information.
+    if ($globals_only) {
+	return;
+    }
+
     # Determine the root of the kolab installation, and read `kolab.globals'
     # Notice that the location of the files is handled by dist_conf,
     # so we don't use $tempval for anything other than storing it in
@@ -110,8 +116,6 @@
         $config{'log_level'} = KOLAB_WARN;
         &log('C', 'Unable to determine the kolab user main directory', KOLAB_ERROR);	
 	$error = 1;
-    } else {
-       $config{'prefix'} = $tempval;
     }
 
     # Now read `kolab.conf', overwriting values read from `kolab.globals'