[Pkg-sks-commit] r142 - in sks/trunk/sks/debian: . patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 15:07:39 +0000 (Thu, 19 Jun 2008)
New Revision: 142

Added:
   sks/trunk/sks/debian/patches/206_also_write_empty_diffs
Modified:
   sks/trunk/sks/debian/changelog
Log:
[project @ 144]
also write empty diff-<ip>.txt files

Original author: weasel
Date: 2004-06-18 22:52:25.883318+00:00

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2008-06-19 15:07:26 UTC (rev 141)
+++ sks/trunk/sks/debian/changelog	2008-06-19 15:07:39 UTC (rev 142)
@@ -1,8 +1,9 @@
 sks (1.0.7-0.2) UNRELEASED; urgency=low
 
-  * print peername in reject errors.
+  * add 205_show_peer_when_config_rejected: print peername in reject errors.
+  * add 206_also_write_empty_diffs: also write empty diff-<ip>.txt files.
 
- -- Peter Palfrader <weasel at debian.org>  Sun,  2 May 2004 15:38:02 +0200
+ -- Peter Palfrader <weasel at debian.org>  Sat, 19 Jun 2004 00:51:37 +0200
 
 sks (1.0.7-0.1) UNRELEASED; urgency=low
 

Added: sks/trunk/sks/debian/patches/206_also_write_empty_diffs
===================================================================
--- sks/trunk/sks/debian/patches/206_also_write_empty_diffs	                        (rev 0)
+++ sks/trunk/sks/debian/patches/206_also_write_empty_diffs	2008-06-19 15:07:39 UTC (rev 142)
@@ -0,0 +1,28 @@
+diff -ruN sks-1.0.7-old/reconserver.ml sks-1.0.7/reconserver.ml
+--- sks-1.0.7-old/reconserver.ml	Fri Feb 20 00:57:32 2004
++++ sks-1.0.7/reconserver.ml	Sat Jun 19 00:51:14 2004
+@@ -179,9 +179,9 @@
+       let elements = Set.elements results in
+       let hashes = hashconvert elements in
+       print_hashes hashes;
++      log_diffs (sprintf "/var/spool/sks/diff-%s.txt" (sockaddr_to_name addr)) hashes;
+       if List.length elements > 0 
+       then (
+-	log_diffs (sprintf "diff-%s.txt" (sockaddr_to_name addr)) hashes;
+ 	update_recover_list elements http_addr;
+ 	[Eventloop.Event (Unix.gettimeofday () +. 10.0,
+ 			  Eventloop.make_tc ~cb:get_missing_keys
+@@ -216,12 +216,10 @@
+ 	ignore (plerror 4 "Reconciliation complete");
+ 	let hashes = hashconvert results in
+ 	print_hashes hashes;
++	log_diffs (sprintf "/var/spool/sks/diff-%s.txt" (sockaddr_to_name partner)) hashes;
+ 	match results with
+ 	    [] -> []
+ 	  | _ ->
+-	      log_diffs (sprintf "diff-%s.txt"
+-			   (sockaddr_to_name partner)) 
+-	      hashes;
+ 	      update_recover_list results http_addr;
+ 	      [Eventloop.Event (Unix.gettimeofday (), 
+ 				Eventloop.make_tc ~cb:get_missing_keys