summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Parent <math.parent@gmail.com>2009-12-13 16:05:38 (GMT)
committerMathieu Parent <math.parent@gmail.com>2009-12-13 16:05:38 (GMT)
commit3c07ee6a746b3b094008edaa5774a19950c143ad (patch)
treeecb434a8c0daf24283eda034878c57f147d0da12
parent82b88f3b213aa5cb26760aa538a2b1df2010ac34 (diff)
downloadperl-Kolab-3c07ee6a746b3b094008edaa5774a19950c143ad.tar.gz
$Kolab::do_reload is now an argument to Kolab::Conf::rebuildTemplates().
-rw-r--r--ChangeLog5
-rw-r--r--lib/Kolab/Conf.pm5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e7e757..0d41fbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-12-13 Mathieu Parent <math.parent@gmail.com>
+ * lib/Kolab/Conf.pm, sbin/kolabconf.in: $Kolab::do_reload is now an
+ argument to Kolab::Conf::rebuildTemplates().
+
+2009-12-13 Mathieu Parent <math.parent@gmail.com>
+
* lib/Kolab/Conf.pm, sbin/kolabconf.in: new @@@print@@@ macro
available for: getLDAPReplicas(), getLDAPAccess(),
getCyrusGroups(), getPostfixMap(map). This removed the use of
diff --git a/lib/Kolab/Conf.pm b/lib/Kolab/Conf.pm
index c6a226b..4601e6b 100644
--- a/lib/Kolab/Conf.pm
+++ b/lib/Kolab/Conf.pm
@@ -595,6 +595,9 @@ sub loadMetaTemplates
sub rebuildTemplates
{
+ my %args = @_;
+ $args{doreload} = 1 if !exists $args{doreload};
+
my $key;
my $value;
my $section="";
@@ -632,7 +635,7 @@ sub rebuildTemplates
# - 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 {