[pkg-kolab] r809 - kolabconf/branches/2.2/debian/patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-04-26 11:29:05 +0000 (Sat, 26 Apr 2008)
New Revision: 809

Modified:
   kolabconf/branches/2.2/debian/patches/95-runonchange.dpatch
Log:
Better and working patch (it was restarting daemons too often)


Modified: kolabconf/branches/2.2/debian/patches/95-runonchange.dpatch
===================================================================
--- kolabconf/branches/2.2/debian/patches/95-runonchange.dpatch	2008-04-26 11:28:46 UTC (rev 808)
+++ kolabconf/branches/2.2/debian/patches/95-runonchange.dpatch	2008-04-26 11:29:05 UTC (rev 809)
@@ -6,18 +6,21 @@
 
 @DPATCH@
 diff -urNad kolabconf-2.2~rc2+20080314~/lib/Kolab/Conf.pm kolabconf-2.2~rc2+20080314/lib/Kolab/Conf.pm
---- kolabconf-2.2~rc2+20080314~/lib/Kolab/Conf.pm	2008-04-20 20:04:05.000000000 +0200
-+++ kolabconf-2.2~rc2+20080314/lib/Kolab/Conf.pm	2008-04-20 20:04:50.000000000 +0200
-@@ -222,7 +222,7 @@
-     #chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $cfg);
-     #chmod(0600, $cfg) if ($cfg =~ /openldap/);
+--- kolabconf-2.2~rc2+20080314~/lib/Kolab/Conf.pm	2008-04-26 13:21:55.000000000 +0200
++++ kolabconf-2.2~rc2+20080314/lib/Kolab/Conf.pm	2008-04-26 13:23:54.000000000 +0200
+@@ -100,6 +100,11 @@
+ 	);
  
--    if (-f $oldcfg && !defined $special_templates{$tmpl} ) {
-+    if (!defined $special_templates{$tmpl} ) {
-         my $rc = `diff -q $cfg $oldcfg`;
-         chomp($rc);
-         if ($rc) {
-@@ -243,8 +243,8 @@
+     my $oldmask = umask 077;
++    #creating the config file is changing it
++    if (! -f $cfg) { 
++        $templatehaschanged{$tmpl} = 1
++        Kolab::log('T', "`$cfg' creation detected", KOLAB_DEBUG );
++    }
+     copy($cfg, $oldcfg);
+     #chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
+     # To avoid warnings, the backup files must be owned by root
+@@ -243,8 +248,8 @@
  #} elsif ($cfg =~ /example/) {
  	    } else {
  		Kolab::log('T', "`$cfg' change detected ", KOLAB_DEBUG );
@@ -27,7 +30,7 @@
  
              Kolab::log('T', "`$cfg' change detected: $rc", KOLAB_DEBUG );
          }
-@@ -675,7 +675,7 @@
+@@ -675,7 +680,7 @@
      foreach $key (keys %runonchange) {
  	if (defined $templatehaschanged{$key})
  	{