X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fmatita%2FmatitaAuthentication.ml;h=2d9b377cab7006a75bcdccf1375e6880377de5aa;hb=ea12b736382320bcedad780ec0eb522ff5cc35a5;hp=5669658513a13f1d0e03748abbca6157585c9b1c;hpb=54f0752c831479f87d61afcdfdafd2a35edb4053;p=helm.git diff --git a/matitaB/matita/matitaAuthentication.ml b/matitaB/matita/matitaAuthentication.ml index 566965851..2d9b377ca 100644 --- a/matitaB/matita/matitaAuthentication.ml +++ b/matitaB/matita/matitaAuthentication.ml @@ -136,18 +136,17 @@ let read_ft uid = [] ;; -let set_file_flag uid filename flag = +let set_file_flag uid files_flags = let ft = read_ft uid in - let oldflag = - try List.assoc filename ft - with Not_found -> MatitaFilesystem.MSynchronized + let files = List.map fst files_flags in + let ft = List.filter (fun (x,_) -> not (List.mem x files)) ft in + let ft' = List.fold_left (fun acc (filename,flag) -> + let filename = MatitaFilesystem.normalize_qfn filename in + try + (filename,HExtlib.unopt flag)::acc + with Failure _ -> acc) [] files_flags in - if oldflag <> MatitaFilesystem.MConflict - then - let ft = (filename,flag):: - List.filter (fun (fn,_) -> fn <> filename) ft in - write_ft uid ft - else () + write_ft uid (ft'@ft) ;; let add_user uid pw =