[Limacute-commit] r87 - trunk/cybar

[limacute at projects.linpro.no]

Author: limacute
Date: 2007-01-12 13:03:58 +0100 (Fri, 12 Jan 2007)
New Revision: 87

Modified:
   trunk/cybar/cybar.ml
Log:
Bumped version number and corrected copyright.



Modified: trunk/cybar/cybar.ml
===================================================================
--- trunk/cybar/cybar.ml	2007-01-12 09:26:03 UTC (rev 86)
+++ trunk/cybar/cybar.ml	2007-01-12 12:03:58 UTC (rev 87)
@@ -1,6 +1,7 @@
 (*
   cybar - fast CYrus mailspool BAckup and Restore.
-  Copyright (C) 2006  Jørgen H. Fjeld <jhf at linpro.no>
+  Author Jørgen H. Fjeld <jhf at linpro.no>
+  Copyright (C) 2006 Linpro AS
  
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -16,14 +17,6 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-
-  Linpro AS, hereby disclaims all copyright interest in the program
-  `cybar' (which does fast backup and restore of cyrus mailspool) written
-  by Jørgen H. Fjeld
- 
-  Dag Alfstad, Daglig leder, 1 June 2006
-  <Insert electronic signature of Dag Alfstad on above text here>
-
  *)
 
 (** Use modules where arguments have a label.
@@ -588,7 +581,7 @@
 
 (** Set default options *)
 let options = {
-    version="2006-07-20";
+    version="2007-01-12";
     verbose=false;
     progress=false;
     imapd_conf="/kolab/etc/imapd/imapd.conf";
@@ -2088,13 +2081,14 @@
     let collected = [] in
       enumerate_users ~virtdomains ~hashimapspool ~base ~collector ~collected 
   in
-  let recover_users users = 
+  let rec recover_users users = 
     match users with
         [] -> ()
       | ((user,dir)::users) ->
           let find_user_backup_dir user = dir in
              verbose (lazy("Starting recovery for user "^(show_user user))) ;
-            restore ~statistics ~was_deleted:false user
+             restore ~statistics ~was_deleted:false user ;
+             recover_users users
   in
   let recoverable_users = find_recoverable_users () in
     verbose (lazy "Starting recovery") ;