Commits

Kristian Fiskerstrand committed 9391b88

Fix MR bug combined with eclean

Comments (0)

Files changed (1)

 
 diff -r 5a15aab0027a CHANGELOG
 --- a/CHANGELOG	Sun Oct 28 21:50:46 2012 +0100
-+++ b/CHANGELOG	Sun Oct 28 21:59:11 2012 +0100
++++ b/CHANGELOG	Sun Oct 28 23:07:09 2012 +0100
 @@ -3,6 +3,10 @@
      from self-signatures on the key's UIDs. In addition, instead of 8-digit
      key IDs, index entries now return the most specific key ID possible:
    - Fix X-HKP-Results-Count so that limit=0 returns no results, but include
 diff -r 5a15aab0027a Makefile
 --- a/Makefile	Sun Oct 28 21:50:46 2012 +0100
-+++ b/Makefile	Sun Oct 28 21:59:11 2012 +0100
++++ b/Makefile	Sun Oct 28 23:07:09 2012 +0100
 @@ -80,11 +80,11 @@
  ROBJS=$(ROBJS.bc:.cmo=.cmx)
  
  	sksdump.cmo incdump.cmo dbserver.cmo reconComm.cmo recoverList.cmo \
 diff -r 5a15aab0027a dbserver.ml
 --- a/dbserver.ml	Sun Oct 28 21:50:46 2012 +0100
-+++ b/dbserver.ml	Sun Oct 28 21:59:11 2012 +0100
++++ b/dbserver.ml	Sun Oct 28 23:07:09 2012 +0100
 @@ -170,7 +170,13 @@
    (** returns list of keys readied for presentation *)
    let clean_keys request keys =
              else key
 diff -r 5a15aab0027a fixkey.ml
 --- a/fixkey.ml	Sun Oct 28 21:50:46 2012 +0100
-+++ b/fixkey.ml	Sun Oct 28 21:59:11 2012 +0100
++++ b/fixkey.ml	Sun Oct 28 23:07:09 2012 +0100
 @@ -24,6 +24,7 @@
  open MoreLabels
  open Common
 + presentation_filter false key
 diff -r 5a15aab0027a fixkey.mli
 --- a/fixkey.mli	Sun Oct 28 21:50:46 2012 +0100
-+++ b/fixkey.mli	Sun Oct 28 21:59:11 2012 +0100
++++ b/fixkey.mli	Sun Oct 28 23:07:09 2012 +0100
 @@ -15,4 +15,8 @@
  val drop_bad_sigs : Packet.packet list -> Packet.packet list
  val sig_filter_sigpair :
 +
 diff -r 5a15aab0027a index.ml
 --- a/index.ml	Sun Oct 28 21:50:46 2012 +0100
-+++ b/index.ml	Sun Oct 28 21:59:11 2012 +0100
++++ b/index.ml	Sun Oct 28 23:07:09 2012 +0100
 @@ -27,40 +27,12 @@
  open Packet
  open Request
    List.stable_sort list
 diff -r 5a15aab0027a index.mli
 --- a/index.mli	Sun Oct 28 21:50:46 2012 +0100
-+++ b/index.mli	Sun Oct 28 21:59:11 2012 +0100
++++ b/index.mli	Sun Oct 28 23:07:09 2012 +0100
 @@ -1,42 +1,39 @@
 -type siginfo
 -val empty_siginfo : unit -> siginfo
    Request.request -> Packet.packet list -> string -> string list
 diff -r 5a15aab0027a request.ml
 --- a/request.ml	Sun Oct 28 21:50:46 2012 +0100
-+++ b/request.ml	Sun Oct 28 21:59:11 2012 +0100
++++ b/request.ml	Sun Oct 28 23:07:09 2012 +0100
 @@ -45,6 +45,7 @@
                   machine_readable: bool;
                   clean: bool;
                        }
  
  let comma_rxp = Str.regexp ","
-@@ -69,6 +71,8 @@
+@@ -68,7 +70,12 @@
+             | ("options",options) ->
                  let options = Str.split comma_rxp options in
                  if List.mem "mr" options
-                 then { request with machine_readable = true }
+-                then { request with machine_readable = true }
++                then 
++                 (if List.mem "eclean" options 
++                   then { request with machine_readable = true; extended_clean = true }
++                   else { request with machine_readable = true; extended_clean = false })
 +                else if List.mem "eclean" options
 +                then { request with extended_clean = true }
                  else request
              | ("op","x-stats") -> {request with kind = Stats };
 diff -r 5a15aab0027a request.mli
 --- a/request.mli	Sun Oct 28 21:50:46 2012 +0100
-+++ b/request.mli	Sun Oct 28 21:59:11 2012 +0100
++++ b/request.mli	Sun Oct 28 23:07:09 2012 +0100
 @@ -11,6 +11,7 @@
    machine_readable : bool;
    clean : bool;
  val comma_rxp : Str.regexp
 diff -r 5a15aab0027a sigInfo.ml
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/sigInfo.ml	Sun Oct 28 21:59:11 2012 +0100
++++ b/sigInfo.ml	Sun Oct 28 23:07:09 2012 +0100
 @@ -0,0 +1,132 @@
 +(***********************************************************************)
 +(* sigInfo.ml                                                           *)
 +  
 diff -r 5a15aab0027a sigInfo.mli
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/sigInfo.mli	Sun Oct 28 21:59:11 2012 +0100
++++ b/sigInfo.mli	Sun Oct 28 23:07:09 2012 +0100
 @@ -0,0 +1,14 @@
 +type siginfo = {
 +  mutable userid : string option;