mathieu: server/perl-kolab/lib/Kolab Conf.pm,1.13,1.14

[cvs at kolab.org]

Author: mathieu

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

Modified Files:
	Conf.pm 
Log Message:
$Kolab::do_reload is now an argument to Kolab::Conf::rebuildTemplates().


Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/Conf.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Conf.pm	13 Dec 2009 15:19:23 -0000	1.13
+++ Conf.pm	13 Dec 2009 16:05:38 -0000	1.14
@@ -595,6 +595,9 @@
 
 sub rebuildTemplates
 {
+    my %args = @_;
+    $args{doreload} = 1 if !exists $args{doreload};
+
     my $key;
     my $value;
     my $section="";
@@ -632,7 +635,7 @@
         # - kolabsrv rc post reload  (in other distributions)
         # The commands with ' rc ' may only be executed when reloading is not
         # prohibited by the user with the "-n" option.
-        if ($Kolab::do_reload || $cmd !~ / rc \S+ re(start|load)/) {
+        if ($args{doreload} || $cmd !~ / rc \S+ re(start|load)/) {
             Kolab::log('T', 'Executing command: '.$cmd, KOLAB_DEBUG );
             system($cmd);
         } else {