Changeset 2157 for box/trunk/bin/bbackupquery/BackupQueries.cpp

Timestamp:

05/05/2008 15:44:38 (4 years ago)

Author:

chris

Message:

Add restore -f option to force restore to continue after an error.

File:

• box/trunk/bin/bbackupquery/BackupQueries.cpp (modified) (4 diffs)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -218 +218 @@
                 { "get",  "i" },
                 { "compare", "alcqAEQ" },
-                { "restore", "dri" },
+                { "restore", "drif" },
                 { "help", "" },
                 { "usage", "" },
@@ -1967 +1967 @@
         if(args.size() != 2)
         {
-                BOX_ERROR("Incorrect usage. restore [-d] [-r] [-i] <remote-name> <local-name>");
+                BOX_ERROR("Incorrect usage. restore [-drif] <remote-name> <local-name>");
                 return;
         }
@@ -2030 +2030 @@
                         true /* print progress dots */, restoreDeleted, 
                         false /* don't undelete after restore! */, 
-                        opts['r'] /* resume? */);
+                        opts['r'] /* resume? */,
+                        opts['f'] /* force continue after errors */);
         }
         catch(std::exception &e)
@@ -2051 +2052 @@
                 break;
         
+        case Restore_CompleteWithErrors:
+                BOX_WARNING("Restore complete, but some files could not be "
+                        "restored.");
+                break;
+        
         case Restore_ResumePossible:
-                BOX_ERROR("Resume possible -- repeat command with -r flag to resume");
+                BOX_ERROR("Resume possible -- repeat command with -r flag "
+                        "to resume.");
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 break;
         
         case Restore_TargetExists:
-                BOX_ERROR("The target directory exists. You cannot restore over an existing directory.");
+                BOX_ERROR("The target directory exists. You cannot restore "
+                        "over an existing directory.");
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 break;