[pkg-kolab] r1010 - in libkolab-perl/trunk/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-11-26 22:29:16 +0000 (Wed, 26 Nov 2008)
New Revision: 1010

Modified:
   libkolab-perl/trunk/debian/changelog
   libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.diff
Log:
update to current syncrepl patch


Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog	2008-11-26 21:28:37 UTC (rev 1009)
+++ libkolab-perl/trunk/debian/changelog	2008-11-26 22:29:16 UTC (rev 1010)
@@ -2,7 +2,7 @@
 
   * update to current syncrepl patch
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 26 Nov 2008 22:21:14 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Wed, 26 Nov 2008 23:27:06 +0100
 
 libkolab-perl (1:2.2.0-2) unstable; urgency=medium
 

Modified: libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.diff	2008-11-26 21:28:37 UTC (rev 1009)
+++ libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.diff	2008-11-26 22:29:16 UTC (rev 1010)
@@ -9,7 +9,7 @@
 ===================================================================
 --- /dev/null
 +++ b/lib/Kolab/LDAP/Backend/syncrepl.pm
-@@ -0,0 +1,324 @@
+@@ -0,0 +1,330 @@
 +package Kolab::LDAP::Backend::syncrepl;
 +
 +##
@@ -72,10 +72,11 @@
 +# giving an argument means: set
 +sub cookie {
 +  my($cookie) = @_;
++  my $syncrepl_cookie_file = $Kolab::config{'syncrepl_cookie_file'} || '/tmp/kolab_syncrepl_cookie_file';
 +  if(defined($cookie)) {
-+    if(!open(COOKIE_FILE, '>', $Kolab::config{'syncrepl_cookie_file'})) {
-+        Kolab::log("SYNCREPL', 'Cannot open file `".$Kolab::config{'syncrepl_cookie_file'}.
-+        "' for writing", KOLAB_DEBUG);
++    if(!open(COOKIE_FILE, '>', $syncrepl_cookie_file)) {
++        Kolab::log("SYNCREPL', 'Cannot open file `".$syncrepl_cookie_file.
++        "' for writing: $!", KOLAB_DEBUG);
 +        &abort;
 +    }
 +    Kolab::log("SYNCREPL', 'Writing cookie to file: ".$cookie, KOLAB_DEBUG);
@@ -83,9 +84,14 @@
 +    close(COOKIE_FILE);
 +    return $cookie;
 +  } else {
-+    if(!open(COOKIE_FILE, '+<', $Kolab::config{'syncrepl_cookie_file'})) {
-+        Kolab::log("SYNCREPL', 'Cannot open file `".$Kolab::config{'syncrepl_cookie_file'}.
-+        "' for reading", KOLAB_DEBUG);
++    #create if it doesn't exists
++    if(! -f $syncrepl_cookie_file) {
++        open COOKIE_FILE, '>', $syncrepl_cookie_file;
++        close COOKIE_FILE;
++    }
++    if(!open(COOKIE_FILE, '+<', $syncrepl_cookie_file)) {
++        Kolab::log("SYNCREPL', 'Cannot open file `".$syncrepl_cookie_file.
++        "' for reading: $!", KOLAB_DEBUG);
 +        &abort;
 +    }
 +    read COOKIE_FILE, $cookie, 1024, 0;